diff options
1146 files changed, 27670 insertions, 24070 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b2ec787313e..4517080bb30 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,11 @@ -###### Description of changes +## Description of changes <!-- For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates. For new packages please briefly describe the package or provide a link to its homepage. --> -###### Things done +## Things done <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. --> diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md index ec78cd0c9a9..4eb74c0b691 100644 --- a/doc/builders/packages/ibus.section.md +++ b/doc/builders/packages/ibus.section.md @@ -34,5 +34,7 @@ The `ibus-engines.typing-booster` package contains a program named `emoji-picker On NixOS, it can be installed using the following expression: ```nix -{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; } +{ pkgs, ... }: { + fonts.packages = with pkgs; [ noto-fonts-emoji ]; +} ``` diff --git a/doc/common.nix b/doc/common.nix new file mode 100644 index 00000000000..56f723eb6bd --- /dev/null +++ b/doc/common.nix @@ -0,0 +1,4 @@ +{ + outputPath = "share/doc/nixpkgs"; + indexPath = "manual.html"; +} diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index a732eee4b96..0b7b49bf7dd 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -23,6 +23,14 @@ $ nix-shell If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`. +## devmode {#sec-contributing-devmode} + +The shell in the manual source directory makes available a command, `devmode`. +It is a daemon, that: +1. watches the manual's source for changes and when they occur — rebuilds +2. HTTP serves the manual, injecting a script that triggers reload on changes +3. opens the manual in the default browser + ## Syntax {#sec-contributing-markup} As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. diff --git a/doc/default.nix b/doc/default.nix index 8efa406ec1e..f4270ae856d 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -3,6 +3,8 @@ let inherit (pkgs) lib; inherit (lib) hasPrefix removePrefix; + common = import ./common.nix; + lib-docs = import ./doc-support/lib-function-docs.nix { inherit pkgs nixpkgs; libsets = [ @@ -132,15 +134,15 @@ in pkgs.stdenv.mkDerivation { ''; installPhase = '' - dest="$out/share/doc/nixpkgs" + dest="$out/${common.outputPath}" mkdir -p "$(dirname "$dest")" mv out "$dest" - mv "$dest/index.html" "$dest/manual.html" + mv "$dest/index.html" "$dest/${common.indexPath}" cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ - echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; } diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index 6b19e02e74e..b7f1f19546a 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -12,8 +12,11 @@ compatible are available as well. For example, there can be a To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional ```nix -cudaSupport ? false -cudaPackages ? {} +{ config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } +, ... +}: ``` When using `callPackage`, you can choose to pass in a different variant, e.g. diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 947ce602865..c8a902c1b0e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1185,11 +1185,12 @@ following are specific to `buildPythonPackage`: variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this - defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications - to `""`. + defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pipInstallFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `pipInstallFlags=["--install-option='--cpp_implementation'"]`. +* `pipBuildFlags ? []`: A list of strings. Arguments to be passed to `pip wheel`. +* `pypaBuildFlags ? []`: A list of strings. Arguments to be passed to `python -m build --wheel`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). * `preShellHook`: Hook to execute commands before `shellHook`. @@ -1244,6 +1245,27 @@ with import <nixpkgs> {}; in python.withPackages(ps: [ ps.blaze ])).env ``` +The next example shows a non trivial overriding of the `blas` implementation to +be used through out all of the Python package set: + +```nix +python3MyBlas = pkgs.python3.override { + packageOverrides = self: super: { + # We need toPythonModule for the package set to evaluate this + blas = super.toPythonModule(super.pkgs.blas.override { + blasProvider = super.pkgs.mkl; + }); + lapack = super.toPythonModule(super.pkgs.lapack.override { + lapackProvider = super.pkgs.mkl; + }); + }; +}; +``` + +This is particularly useful for numpy and scipy users who want to gain speed with other blas implementations. +Note that using simply `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in +compilation issues, because scipy dependencies need to use the same blas implementation as well. + #### Optional extra dependencies {#python-optional-dependencies} Some packages define optional dependencies for additional features. With @@ -1463,6 +1485,10 @@ are used in `buildPythonPackage`. - `flitBuildHook` to build a wheel using `flit`. - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. +- `pypaBuildHook` to build a wheel using + [`pypa/build`](https://pypa-build.readthedocs.io/en/latest/index.html) and + PEP 517/518. Note a build system (e.g. `setuptools` or `flit`) should still + be added as `nativeBuildInput`. - `pipInstallHook` to install wheels. - `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). - `pythonCatchConflictsHook` to check whether a Python package is not already existing. diff --git a/doc/shell.nix b/doc/shell.nix new file mode 100644 index 00000000000..d71e3f3a709 --- /dev/null +++ b/doc/shell.nix @@ -0,0 +1,20 @@ +let + pkgs = import ../. { + config = {}; + overlays = []; + }; + + common = import ./common.nix; + inherit (common) outputPath indexPath; + + web-devmode = import ../pkgs/tools/nix/web-devmode.nix { + inherit pkgs; + buildArgs = "./."; + open = "/${outputPath}/${indexPath}"; + }; +in + pkgs.mkShell { + packages = [ + web-devmode + ]; + } diff --git a/lib/generators.nix b/lib/generators.nix index a2dddedd2d3..c37be1942d8 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -81,9 +81,10 @@ rec { */ toKeyValue = { mkKeyValue ? mkKeyValueDefault {} "=", - listsAsDuplicateKeys ? false + listsAsDuplicateKeys ? false, + indent ? "" }: - let mkLine = k: v: mkKeyValue k v + "\n"; + let mkLine = k: v: indent + mkKeyValue k v + "\n"; mkLines = if listsAsDuplicateKeys then k: v: map (mkLine k) (if lib.isList v then v else [v]) else k: v: [ (mkLine k v) ]; diff --git a/lib/lists.nix b/lib/lists.nix index 5d9af0cf711..3e058b3f1ae 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -3,7 +3,7 @@ { lib }: let inherit (lib.strings) toInt; - inherit (lib.trivial) compare min; + inherit (lib.trivial) compare min id; inherit (lib.attrsets) mapAttrs; in rec { @@ -180,18 +180,18 @@ rec { else if len != 1 then multiple else head found; - /* Find the first element in the list matching the specified + /* Find the first index in the list matching the specified predicate or return `default` if no such element exists. - Type: findFirst :: (a -> bool) -> a -> [a] -> a + Type: findFirstIndex :: (a -> Bool) -> b -> [a] -> (Int | b) Example: - findFirst (x: x > 3) 7 [ 1 6 4 ] - => 6 - findFirst (x: x > 9) 7 [ 1 6 4 ] - => 7 + findFirstIndex (x: x > 3) null [ 0 6 4 ] + => 1 + findFirstIndex (x: x > 9) null [ 0 6 4 ] + => null */ - findFirst = + findFirstIndex = # Predicate pred: # Default value to return @@ -229,7 +229,33 @@ rec { if resultIndex < 0 then default else - elemAt list resultIndex; + resultIndex; + + /* Find the first element in the list matching the specified + predicate or return `default` if no such element exists. + + Type: findFirst :: (a -> bool) -> a -> [a] -> a + + Example: + findFirst (x: x > 3) 7 [ 1 6 4 ] + => 6 + findFirst (x: x > 9) 7 [ 1 6 4 ] + => 7 + */ + findFirst = + # Predicate + pred: + # Default value to return + default: + # Input list + list: + let + index = findFirstIndex pred null list; + in + if index == null then + default + else + elemAt list index; /* Return true if function `pred` returns true for at least one element of `list`. @@ -637,6 +663,32 @@ rec { else if start + count > len then len - start else count); + /* The common prefix of two lists. + + Type: commonPrefix :: [a] -> [a] -> [a] + + Example: + commonPrefix [ 1 2 3 4 5 6 ] [ 1 2 4 8 ] + => [ 1 2 ] + commonPrefix [ 1 2 3 ] [ 1 2 3 4 5 ] + => [ 1 2 3 ] + commonPrefix [ 1 2 3 ] [ 4 5 6 ] + => [ ] + */ + commonPrefix = + list1: + list2: + let + # Zip the lists together into a list of booleans whether each element matches + matchings = zipListsWith (fst: snd: fst != snd) list1 list2; + # Find the first index where the elements don't match, + # which will then also be the length of the common prefix. + # If all elements match, we fall back to the length of the zipped list, + # which is the same as the length of the smaller list. + commonPrefixLength = findFirstIndex id (length matchings) matchings; + in + take commonPrefixLength list1; + /* Return the last element of a list. This function throws an error if the list is empty. diff --git a/lib/modules.nix b/lib/modules.nix index f16df20425e..4966619f663 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -639,7 +639,7 @@ let unmatchedDefns = []; } else if optionDecls != [] then - if all (x: x.options.type.name == "submodule") optionDecls + if all (x: x.options.type.name or null == "submodule") optionDecls # Raw options can only be merged into submodules. Merging into # attrsets might be nice, but ambiguous. Suppose we have # attrset as a `attrsOf submodule`. User declares option diff --git a/lib/path/default.nix b/lib/path/default.nix index 3a871bc0528..24a7f85affc 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -271,8 +271,57 @@ in /* No rec! Add dependencies on this file at the top. */ { second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; joinRelPath components; + /* + Split the filesystem root from a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path). + The result is an attribute set with these attributes: + - `root`: The filesystem root of the path, meaning that this directory has no parent directory. + - `subpath`: The [normalised subpath string](#function-library-lib.path.subpath.normalise) that when [appended](#function-library-lib.path.append) to `root` returns the original path. + + Laws: + - [Appending](#function-library-lib.path.append) the `root` and `subpath` gives the original path: + + p == + append + (splitRoot p).root + (splitRoot p).subpath + + - Trying to get the parent directory of `root` using [`readDir`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readDir) returns `root` itself: + + dirOf (splitRoot p).root == (splitRoot p).root + + Type: + splitRoot :: Path -> { root :: Path, subpath :: String } + + Example: + splitRoot /foo/bar + => { root = /.; subpath = "./foo/bar"; } + + splitRoot /. + => { root = /.; subpath = "./."; } + + # Nix neutralises `..` path components for all path values automatically + splitRoot /foo/../bar + => { root = /.; subpath = "./bar"; } + + splitRoot "/foo/bar" + => <error> + */ + splitRoot = path: + assert assertMsg + (isPath path) + "lib.path.splitRoot: Argument is of type ${typeOf path}, but a path was expected"; + let + deconstructed = deconstructPath path; + in { + root = deconstructed.root; + subpath = joinRelPath deconstructed.components; + }; + /* Whether a value is a valid subpath string. + A subpath string points to a specific file or directory within an absolute base directory. + It is a stricter form of a relative path that excludes `..` components, since those could escape the base directory. + - The value is a string - The string is not empty diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index 3e4b216f099..8bfb6f20121 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -3,7 +3,7 @@ { libpath }: let lib = import libpath; - inherit (lib.path) hasPrefix removePrefix append subpath; + inherit (lib.path) hasPrefix removePrefix append splitRoot subpath; cases = lib.runTests { # Test examples from the lib.path.append documentation @@ -74,6 +74,23 @@ let expected = "./foo"; }; + testSplitRootExample1 = { + expr = splitRoot /foo/bar; + expected = { root = /.; subpath = "./foo/bar"; }; + }; + testSplitRootExample2 = { + expr = splitRoot /.; + expected = { root = /.; subpath = "./."; }; + }; + testSplitRootExample3 = { + expr = splitRoot /foo/../bar; + expected = { root = /.; subpath = "./bar"; }; + }; + testSplitRootExample4 = { + expr = (builtins.tryEval (splitRoot "/foo/bar")).success; + expected = false; + }; + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 56bf31ea5da..887ea39a080 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -500,6 +500,39 @@ runTests { expected = { a = [ 2 3 ]; b = [7]; c = [8];}; }; + testListCommonPrefixExample1 = { + expr = lists.commonPrefix [ 1 2 3 4 5 6 ] [ 1 2 4 8 ]; + expected = [ 1 2 ]; + }; + testListCommonPrefixExample2 = { + expr = lists.commonPrefix [ 1 2 3 ] [ 1 2 3 4 5 ]; + expected = [ 1 2 3 ]; + }; + testListCommonPrefixExample3 = { + expr = lists.commonPrefix [ 1 2 3 ] [ 4 5 6 ]; + expected = [ ]; + }; + testListCommonPrefixEmpty = { + expr = lists.commonPrefix [ ] [ 1 2 3 ]; + expected = [ ]; + }; + testListCommonPrefixSame = { + expr = lists.commonPrefix [ 1 2 3 ] [ 1 2 3 ]; + expected = [ 1 2 3 ]; + }; + testListCommonPrefixLazy = { + expr = lists.commonPrefix [ 1 ] [ 1 (abort "lib.lists.commonPrefix shouldn't evaluate this")]; + expected = [ 1 ]; + }; + # This would stack overflow if `commonPrefix` were implemented using recursion + testListCommonPrefixLong = + let + longList = genList (n: n) 100000; + in { + expr = lists.commonPrefix longList longList; + expected = longList; + }; + testSort = { expr = sort builtins.lessThan [ 40 2 30 42 ]; expected = [2 30 40 42]; @@ -530,45 +563,55 @@ runTests { expected = false; }; - testFindFirstExample1 = { - expr = findFirst (x: x > 3) 7 [ 1 6 4 ]; - expected = 6; + testFindFirstIndexExample1 = { + expr = lists.findFirstIndex (x: x > 3) (abort "index found, so a default must not be evaluated") [ 1 6 4 ]; + expected = 1; }; - testFindFirstExample2 = { - expr = findFirst (x: x > 9) 7 [ 1 6 4 ]; - expected = 7; + testFindFirstIndexExample2 = { + expr = lists.findFirstIndex (x: x > 9) "a very specific default" [ 1 6 4 ]; + expected = "a very specific default"; }; - testFindFirstEmpty = { - expr = findFirst (abort "when the list is empty, the predicate is not needed") null []; + testFindFirstIndexEmpty = { + expr = lists.findFirstIndex (abort "when the list is empty, the predicate is not needed") null []; expected = null; }; - testFindFirstSingleMatch = { - expr = findFirst (x: x == 5) null [ 5 ]; - expected = 5; + testFindFirstIndexSingleMatch = { + expr = lists.findFirstIndex (x: x == 5) null [ 5 ]; + expected = 0; }; - testFindFirstSingleDefault = { - expr = findFirst (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ]; + testFindFirstIndexSingleDefault = { + expr = lists.findFirstIndex (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ]; expected = null; }; - testFindFirstNone = { - expr = builtins.tryEval (findFirst (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]); + testFindFirstIndexNone = { + expr = builtins.tryEval (lists.findFirstIndex (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]); expected = { success = false; value = false; }; }; # Makes sure that the implementation doesn't cause a stack overflow - testFindFirstBig = { - expr = findFirst (x: x == 1000000) null (range 0 1000000); + testFindFirstIndexBig = { + expr = lists.findFirstIndex (x: x == 1000000) null (range 0 1000000); expected = 1000000; }; - testFindFirstLazy = { - expr = findFirst (x: x == 1) 7 [ 1 (abort "list elements after the match must not be evaluated") ]; - expected = 1; + testFindFirstIndexLazy = { + expr = lists.findFirstIndex (x: x == 1) null [ 1 (abort "list elements after the match must not be evaluated") ]; + expected = 0; + }; + + testFindFirstExample1 = { + expr = lists.findFirst (x: x > 3) 7 [ 1 6 4 ]; + expected = 6; + }; + + testFindFirstExample2 = { + expr = lists.findFirst (x: x > 9) 7 [ 1 6 4 ]; + expected = 7; }; # ATTRSETS diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 180cca9955e..4adbd69effb 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -371,6 +371,9 @@ checkConfigError \ config.set \ ./declare-set.nix ./declare-enable-nested.nix +# Check that that merging of option collisions doesn't depend on type being set +checkConfigError 'The option .group..*would be a parent of the following options, but its type .<no description>. does not support nested options.\n\s*- option.s. with prefix .group.enable..*' config.group.enable ./merge-typeless-option.nix + # Test that types.optionType merges types correctly checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix diff --git a/lib/tests/modules/merge-typeless-option.nix b/lib/tests/modules/merge-typeless-option.nix new file mode 100644 index 00000000000..627d90b15db --- /dev/null +++ b/lib/tests/modules/merge-typeless-option.nix @@ -0,0 +1,25 @@ +{ lib, ... }: + +let + typeless = + { lib, ... }: + + { + options.group = lib.mkOption { }; + }; + childOfTypeless = + { lib, ... }: + + { + options.group.enable = lib.mkEnableOption "nothing"; + }; +in + +{ + imports = [ + typeless + childOfTypeless + ]; + + config.group.enable = false; +} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e8e8211c8d..cc5b8172d8d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1401,6 +1401,12 @@ githubId = 37193992; name = "Arthur Teisseire"; }; + arti5an = { + email = "artis4n@outlook.com"; + github = "arti5an"; + githubId = 14922630; + name = "Richard Smith"; + }; artturin = { email = "artturin@artturin.com"; matrix = "@artturin:matrix.org"; @@ -4147,6 +4153,12 @@ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; }]; }; + dgollings = { + email = "daniel.gollings+nixpkgs@gmail.com"; + github = "dgollings"; + githubId = 2032823; + name = "Daniel Gollings"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -4445,6 +4457,13 @@ fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; }]; }; + DrSensor = { + name = "Fahmi Akbar Wildana"; + email = "sensorfied@gmail.com"; + matrix = "@drsensor:matrix.org"; + github = "DrSensor"; + githubId = 4953069; + }; drupol = { name = "Pol Dellaiera"; email = "pol.dellaiera@protonmail.com"; @@ -8702,6 +8721,12 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + khaneliman = { + email = "khaneliman12@gmail.com"; + github = "khaneliman"; + githubId = 1778670; + name = "Austin Horstman"; + }; khaser = { email = "a-horohorin@mail.ru"; github = "khaser"; @@ -9853,6 +9878,15 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luisdaranda = { + email = "luisdomingoaranda@gmail.com"; + github = "propet"; + githubId = 8515861; + name = "Luis D. Aranda Sánchez"; + keys = [{ + fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; + }]; + }; luisnquin = { email = "lpaandres2020@gmail.com"; matrix = "@luisnquin:matrix.org"; @@ -9948,6 +9982,12 @@ githubId = 782440; name = "Luna Nova"; }; + lurkki = { + email = "jussi.kuokkanen@protonmail.com"; + github = "Lurkki14"; + githubId = 44469719; + name = "Jussi Kuokkanen"; + }; lux = { email = "lux@lux.name"; github = "luxzeitlos"; @@ -15621,6 +15661,12 @@ githubId = 7669898; name = "Katharina Fey"; }; + spalf = { + email = "tom@tombarrett.xyz"; + name = "tom barrett"; + github = "70m6"; + githubId = 105207964; + }; spease = { email = "peasteven@gmail.com"; github = "spease"; @@ -15694,6 +15740,13 @@ githubId = 219362; name = "Sarah Brofeldt"; }; + srid = { + email = "srid@srid.ca"; + matrix = "@srid:matrix.org"; + github = "srid"; + githubId = 3998; + name = "Sridhar Ratnakumar"; + }; srounce = { name = "Samuel Rounce"; email = "me@samuelrounce.co.uk"; @@ -17519,6 +17572,12 @@ fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; }]; }; + vinetos = { + name = "vinetos"; + email = "vinetosdev@gmail.com"; + github = "vinetos"; + githubId = 10145351; + }; vinnymeller = { email = "vinnymeller@proton.me"; github = "vinnymeller"; diff --git a/nixos/doc/manual/common.nix b/nixos/doc/manual/common.nix new file mode 100644 index 00000000000..48d1d909492 --- /dev/null +++ b/nixos/doc/manual/common.nix @@ -0,0 +1,4 @@ +{ + outputPath = "share/doc/nixos"; + indexPath = "index.html"; +} diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index c306cc084cd..4633c7e1b05 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -11,6 +11,8 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`. +There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-devmode). + **Contributing to the man pages** The man pages are written in [DocBook] which is XML. diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index f2fd6a68293..902dee70180 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -16,6 +16,8 @@ let lib = pkgs.lib; + common = import ./common.nix; + manpageUrls = pkgs.path + "/doc/manpage-urls.json"; # We need to strip references to /nix/store/* from options, @@ -78,11 +80,11 @@ let substituteInPlace ./nixos-options.md \ --replace \ '@NIXOS_OPTIONS_JSON@' \ - ${optionsDoc.optionsJSON}/share/doc/nixos/options.json + ${optionsDoc.optionsJSON}/${common.outputPath}/options.json substituteInPlace ./development/writing-nixos-tests.section.md \ --replace \ '@NIXOS_TEST_OPTIONS_JSON@' \ - ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json + ${testOptionsDoc.optionsJSON}/${common.outputPath}/options.json sed -e '/@PYTHON_MACHINE_METHODS@/ {' -e 'r ${testDriverMachineDocstrings}/machine-methods.md' -e 'd' -e '}' \ -i ./development/writing-nixos-tests.section.md ''; @@ -99,7 +101,7 @@ in rec { } '' # Generate the HTML manual. - dst=$out/share/doc/nixos + dst=$out/${common.outputPath} mkdir -p $dst cp ${../../../doc/style.css} $dst/style.css @@ -120,7 +122,7 @@ in rec { --toc-depth 1 \ --chunk-toc-depth 1 \ ./manual.md \ - $dst/index.html + $dst/${common.indexPath} mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products @@ -131,7 +133,7 @@ in rec { manual = manualHTML; # Index page of the NixOS manual. - manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html"; + manualHTMLIndex = "${manualHTML}/${common.outputPath}/${common.indexPath}"; manualEpub = runCommand "nixos-manual-epub" { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; @@ -162,7 +164,7 @@ in rec { } '' # Generate the epub manual. - dst=$out/share/doc/nixos + dst=$out/${common.outputPath} xsltproc \ --param chapter.autolabel 0 \ @@ -197,7 +199,7 @@ in rec { mkdir -p $out/share/man/man5 nixos-render-docs -j $NIX_BUILD_CORES options manpage \ --revision ${lib.escapeShellArg revision} \ - ${optionsJSON}/share/doc/nixos/options.json \ + ${optionsJSON}/${common.outputPath}/options.json \ $out/share/man/man5/configuration.nix.5 ''; diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 53cf9ed14c3..815bcc071cd 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -249,14 +249,14 @@ update /etc/fstab. which will be used by the boot partition. ```ShellSession - # parted /dev/sda -- mkpart primary 512MB -8GB + # parted /dev/sda -- mkpart root ext4 512MB -8GB ``` 3. Next, add a *swap* partition. The size required will vary according to needs, here a 8GB one is created. ```ShellSession - # parted /dev/sda -- mkpart primary linux-swap -8GB 100% + # parted /dev/sda -- mkpart swap linux-swap -8GB 100% ``` ::: {.note} @@ -550,8 +550,8 @@ corresponding configuration Nix expression. ### Example partition schemes for NixOS on `/dev/sda` (UEFI) ```ShellSession # parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary 512MB -8GB -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% +# parted /dev/sda -- mkpart root ext4 512MB -8GB +# parted /dev/sda -- mkpart swap linux-swap -8GB 100% # parted /dev/sda -- mkpart ESP fat32 1MB 512MB # parted /dev/sda -- set 3 esp on ``` diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index a31f3511a4b..c9da29063e1 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -83,6 +83,8 @@ In addition to numerous new and updated packages, this release has the following - [gitea-actions-runner](https://gitea.com/gitea/act_runner), a CI runner for Gitea/Forgejo Actions. Available as [services.gitea-actions-runner](#opt-services.gitea-actions-runner.instances). +- [evdevremapkeys](https://github.com/philipl/evdevremapkeys), a daemon to remap key events. Available as [services.evdevremapkeys](#opt-services.evdevremapkeys.enable). + - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). - [go2rtc](https://github.com/AlexxIT/go2rtc), a camera streaming appliation with support for RTSP, WebRTC, HomeKit, FFMPEG, RTMP and other protocols. Available as [services.go2rtc](options.html#opt-services.go2rtc.enable). diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 339200ce295..e4e2c49859b 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -34,6 +34,7 @@ - [ebusd](https://ebusd.eu), a daemon for handling communication with eBUS devices connected to a 2-wire bus system (“energy bus” used by numerous heating systems). Available as [services.ebusd](#opt-services.ebusd.enable). +- [systemd-sysupdate](https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html), atomically updates the host OS, container images, portable service images or other sources. Available as [systemd.sysupdate](opt-systemd.sysupdate). ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} @@ -95,6 +96,8 @@ - `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli. +- The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`. + - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. - mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. @@ -123,6 +126,8 @@ - `buildGoModule` `go-modules` attrs have been renamed to `goModules`. +- The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. + - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. @@ -139,6 +144,8 @@ The module update takes care of the new config syntax and the data itself (user - `programs.gnupg.agent.pinentryFlavor` is now set in `/etc/gnupg/gpg-agent.conf`, and will no longer take precedence over a `pinentry-program` set in `~/.gnupg/gpg-agent.conf`. +- `wrapHelm` now exposes `passthru.pluginsDir` which can be passed to `helmfile`. For convenience, a top-level package `helmfile-wrapped` has been added, which inherits `passthru.pluginsDir` from `kubernetes-helm-wrapped`. See [#217768](https://github.com/NixOS/nixpkgs/issues/217768) for details. + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The `qemu-vm.nix` module by default now identifies block devices via diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix new file mode 100644 index 00000000000..70500a12b03 --- /dev/null +++ b/nixos/doc/manual/shell.nix @@ -0,0 +1,20 @@ +let + pkgs = import ../../.. { + config = {}; + overlays = []; + }; + + common = import ./common.nix; + inherit (common) outputPath indexPath; + + web-devmode = import ../../../pkgs/tools/nix/web-devmode.nix { + inherit pkgs; + buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; + open = "/${outputPath}/${indexPath}"; + }; +in + pkgs.mkShell { + packages = [ + web-devmode + ]; + } diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 585c4e51462..641b47def03 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -443,4 +443,21 @@ in rec { ${attrsToSection def.sliceConfig} ''; }; + + # Create a directory that contains systemd definition files from an attrset + # that contains the file names as keys and the content as values. The values + # in that attrset are determined by the supplied format. + definitions = directoryName: format: definitionAttrs: + let + listOfDefinitions = lib.mapAttrsToList + (name: format.generate "${name}.conf") + definitionAttrs; + in + pkgs.runCommand directoryName { } '' + mkdir -p $out + ${(lib.concatStringsSep "\n" + (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions) + )} + ''; + } diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 2eee5cd34d0..5e2e054f7c4 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -42,7 +42,7 @@ let # looking things up. makeCacheConf = { }: let - makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; + makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.packages; }; cache = makeCache pkgs.fontconfig; cache32 = makeCache pkgs.pkgsi686Linux.fontconfig; in @@ -51,7 +51,7 @@ let <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'> <fontconfig> <!-- Font directories --> - ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)} + ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)} ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' <!-- Pre-generated font caches --> <cachedir>${cache}</cachedir> diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 9d41463c947..3b5eaf5b2d7 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -9,7 +9,7 @@ let x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' mkdir -p "$out/share/X11/fonts" font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' - find ${toString config.fonts.fonts} -regex "$font_regexp" \ + find ${toString config.fonts.packages} -regex "$font_regexp" \ -exec ln -sf -t "$out/share/X11/fonts" '{}' \; cd "$out/share/X11/fonts" ${optionalString cfg.decompressFonts '' diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix deleted file mode 100644 index 87cf837e7c8..00000000000 --- a/nixos/modules/config/fonts/fonts.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.fonts; - - defaultFonts = - [ pkgs.dejavu_fonts - pkgs.freefont_ttf - pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts - pkgs.liberation_ttf - pkgs.unifont - pkgs.noto-fonts-emoji - ]; -in -{ - imports = [ - (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.") - ]; - - options = { - - fonts = { - - # TODO: find another name for it. - fonts = mkOption { - type = types.listOf types.path; - default = []; - example = literalExpression "[ pkgs.dejavu_fonts ]"; - description = lib.mdDoc "List of primary font paths."; - }; - - enableDefaultFonts = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable a basic set of fonts providing several font styles - and families and reasonable coverage of Unicode. - ''; - }; - }; - - }; - - config = { fonts.fonts = mkIf cfg.enableDefaultFonts defaultFonts; }; -} diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix index c284c4a0b0a..c41fcdaaa32 100644 --- a/nixos/modules/config/fonts/ghostscript.nix +++ b/nixos/modules/config/fonts/ghostscript.nix @@ -3,31 +3,21 @@ with lib; { - options = { - - fonts = { - - enableGhostscriptFonts = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to add the fonts provided by Ghostscript (such as - various URW fonts and the “Base-14” Postscript fonts) to the - list of system fonts, making them available to X11 - applications. - ''; - }; - + fonts.enableGhostscriptFonts = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to add the fonts provided by Ghostscript (such as + various URW fonts and the “Base-14” Postscript fonts) to the + list of system fonts, making them available to X11 + applications. + ''; }; }; - config = mkIf config.fonts.enableGhostscriptFonts { - - fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; - + fonts.packages = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; }; - } diff --git a/nixos/modules/config/fonts/packages.nix b/nixos/modules/config/fonts/packages.nix new file mode 100644 index 00000000000..46907d5411c --- /dev/null +++ b/nixos/modules/config/fonts/packages.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.fonts; +in +{ + imports = [ + (lib.mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.packages = [ pkgs.corefonts ]; instead.") + (lib.mkRenamedOptionModule [ "fonts" "enableDefaultFonts" ] [ "fonts" "enableDefaultPackages" ]) + (lib.mkRenamedOptionModule [ "fonts" "fonts" ] [ "fonts" "packages" ]) + ]; + + options = { + fonts = { + packages = lib.mkOption { + type = with lib.types; listOf path; + default = []; + example = lib.literalExpression "[ pkgs.dejavu_fonts ]"; + description = lib.mdDoc "List of primary font packages."; + }; + + enableDefaultPackages = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enable a basic set of fonts providing several styles + and families and reasonable coverage of Unicode. + ''; + }; + }; + }; + + config = { + fonts.packages = lib.mkIf cfg.enableDefaultPackages (with pkgs; [ + dejavu_fonts + freefont_ttf + gyre-fonts # TrueType substitutes for standard PostScript fonts + liberation_ttf + unifont + noto-fonts-emoji + ]); + }; +} diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 8f6caaabde8..3f8e088ede9 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -3,8 +3,8 @@ configuration to work. See also - - ./nix.nix - - ./nix-flakes.nix + - ./nix.nix + - ./nix-flakes.nix */ { config, lib, ... }: let @@ -28,9 +28,9 @@ in Whether the `nix-channel` command and state files are made available on the machine. The following files are initialized when enabled: - - `/nix/var/nix/profiles/per-user/root/channels` - - `/root/.nix-channels` - - `$HOME/.nix-defexpr/channels` (on login) + - `/nix/var/nix/profiles/per-user/root/channels` + - `/root/.nix-channels` + - `$HOME/.nix-defexpr/channels` (on login) Disabling this option will not remove the state files from the system. ''; @@ -48,7 +48,7 @@ in "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ] - else []; + else [ ]; defaultText = '' if nix.channel.enable then [ @@ -86,7 +86,7 @@ in ''; environment.extraSetup = mkIf (!cfg.channel.enable) '' - rm $out/bin/nix-channel + rm --force $out/bin/nix-channel ''; # NIX_PATH has a non-empty default according to Nix docs, so we don't unset diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix index cf4e9621d70..2b09281e467 100644 --- a/nixos/modules/config/qt.nix +++ b/nixos/modules/config/qt.nix @@ -19,7 +19,7 @@ let pkgs.qgnomeplatform-qt6 pkgs.adwaita-qt6 ] - else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] + else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins pkgs.qt6Packages.qt6gtk2 ] else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ] else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] @@ -86,6 +86,7 @@ in "adwaita-qt" "adwaita-qt6" ["libsForQt5" "qtstyleplugins"] + ["qt6Packages" "qt6gtk2"] ]; description = lib.mdDoc '' Selects the style to use for Qt applications. diff --git a/nixos/modules/hardware/usb-wwan.nix b/nixos/modules/hardware/usb-modeswitch.nix index 69673872cf9..773891b0032 100644 --- a/nixos/modules/hardware/usb-wwan.nix +++ b/nixos/modules/hardware/usb-modeswitch.nix @@ -7,12 +7,15 @@ with lib; options = { - hardware.usbWwan = { + hardware.usb-modeswitch = { enable = mkOption { type = types.bool; default = false; description = lib.mdDoc '' - Enable this option to support USB WWAN adapters. + Enable this option to support certain USB WLAN and WWAN adapters. + + These network adapters initial present themselves as Flash Drives containing their drivers. + This option enables automatic switching to the networking mode. ''; }; }; @@ -20,7 +23,11 @@ with lib; ###### implementation - config = mkIf config.hardware.usbWwan.enable { + imports = [ + (mkRenamedOptionModule ["hardware" "usbWwan" ] ["hardware" "usb-modeswitch" ]) + ]; + + config = mkIf config.hardware.usb-modeswitch.enable { # Attaches device specific handlers. services.udev.packages = with pkgs; [ usb-modeswitch-data ]; diff --git a/nixos/modules/image/amend-repart-definitions.py b/nixos/modules/image/amend-repart-definitions.py new file mode 100644 index 00000000000..e50ed6fd39a --- /dev/null +++ b/nixos/modules/image/amend-repart-definitions.py @@ -0,0 +1,113 @@ +#!/usr/bin/env python + +"""Amend systemd-repart definiton files. + +In order to avoid Import-From-Derivation (IFD) when building images with +systemd-repart, the definition files created by Nix need to be amended with the +store paths from the closure. + +This is achieved by adding CopyFiles= instructions to the definition files. + +The arbitrary files configured via `contents` are also added to the definition +files using the same mechanism. +""" + +import json +import sys +import shutil +import os +import tempfile +from pathlib import Path + + +def add_contents_to_definition( + definition: Path, contents: dict[str, dict[str, str]] | None +) -> None: + """Add CopyFiles= instructions to a definition for all files in contents.""" + if not contents: + return + + copy_files_lines: list[str] = [] + for target, options in contents.items(): + source = options["source"] + + copy_files_lines.append(f"CopyFiles={source}:{target}\n") + + with open(definition, "a") as f: + f.writelines(copy_files_lines) + + +def add_closure_to_definition( + definition: Path, closure: Path | None, strip_nix_store_prefix: bool | None +) -> None: + """Add CopyFiles= instructions to a definition for all paths in the closure. + + If strip_nix_store_prefix is True, `/nix/store` is stripped from the target path. + """ + if not closure: + return + + copy_files_lines: list[str] = [] + with open(closure, "r") as f: + for line in f: + if not isinstance(line, str): + continue + + source = Path(line.strip()) + target = str(source.relative_to("/nix/store/")) + target = f":{target}" if strip_nix_store_prefix else "" + + copy_files_lines.append(f"CopyFiles={source}{target}\n") + + with open(definition, "a") as f: + f.writelines(copy_files_lines) + + +def main() -> None: + """Amend the provided repart definitions by adding CopyFiles= instructions. + + For each file specified in the `contents` field of a partition in the + partiton config file, a `CopyFiles=` instruction is added to the + corresponding definition file. + + The same is done for every store path of the `closure` field. + + Print the path to a directory that contains the amended repart + definitions to stdout. + """ + partition_config_file = sys.argv[1] + if not partition_config_file: + print("No partition config file was supplied.") + sys.exit(1) + + repart_definitions = sys.argv[2] + if not repart_definitions: + print("No repart definitions were supplied.") + sys.exit(1) + + with open(partition_config_file, "rb") as f: + partition_config = json.load(f) + + if not partition_config: + print("Partition config is empty.") + sys.exit(1) + + temp = tempfile.mkdtemp() + shutil.copytree(repart_definitions, temp, dirs_exist_ok=True) + + for name, config in partition_config.items(): + definition = Path(f"{temp}/{name}.conf") + os.chmod(definition, 0o644) + + contents = config.get("contents") + add_contents_to_definition(definition, contents) + + closure = config.get("closure") + strip_nix_store_prefix = config.get("stripStorePaths") + add_closure_to_definition(definition, closure, strip_nix_store_prefix) + + print(temp) + + +if __name__ == "__main__": + main() diff --git a/nixos/modules/image/repart.md b/nixos/modules/image/repart.md new file mode 100644 index 00000000000..6d0675f21a0 --- /dev/null +++ b/nixos/modules/image/repart.md @@ -0,0 +1,137 @@ +# Building Images via `systemd-repart` {#sec-image-repart} + +You can build disk images in NixOS with the `image.repart` option provided by +the module [image/repart.nix][]. This module uses `systemd-repart` to build the +images and exposes it's entire interface via the `repartConfig` option. + +[image/repart.nix]: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/image/repart.nix + +An example of how to build an image: + +```nix +{ config, modulesPath, ... }: { + + imports = [ "${modulesPath}/image/repart.nix" ]; + + image.repart = { + name = "image"; + partitions = { + "esp" = { + contents = { + ... + }; + repartConfig = { + Type = "esp"; + ... + }; + }; + "root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Label = "nixos"; + ... + }; + }; + }; + }; + +} +``` + +## Nix Store Partition {#sec-image-repart-store-partition} + +You can define a partition that only contains the Nix store and then mount it +under `/nix/store`. Because the `/nix/store` part of the paths is already +determined by the mount point, you have to set `stripNixStorePrefix = true;` so +that the prefix is stripped from the paths before copying them into the image. + +```nix +fileSystems."/nix/store".device = "/dev/disk/by-partlabel/nix-store" + +image.repart.partitions = { + "store" = { + storePaths = [ config.system.build.toplevel ]; + stripNixStorePrefix = true; + repartConfig = { + Type = "linux-generic"; + Label = "nix-store"; + ... + }; + }; +}; +``` + +## Appliance Image {#sec-image-repart-appliance} + +The `image/repart.nix` module can also be used to build self-contained [software +appliances][]. + +[software appliances]: https://en.wikipedia.org/wiki/Software_appliance + +The generation based update mechanism of NixOS is not suited for appliances. +Updates of appliances are usually either performed by replacing the entire +image with a new one or by updating partitions via an A/B scheme. See the +[Chrome OS update process][chrome-os-update] for an example of how to achieve +this. The appliance image built in the following example does not contain a +`configuration.nix` and thus you will not be able to call `nixos-rebuild` from +this system. + +[chrome-os-update]: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/HEAD/README.md + +```nix +let + pkgs = import <nixpkgs> { }; + efiArch = pkgs.stdenv.hostPlatform.efiArch; +in +(pkgs.nixos [ + ({ config, lib, pkgs, modulesPath, ... }: { + + imports = [ "${modulesPath}/image/repart.nix" ]; + + boot.loader.grub.enable = false; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + image.repart = { + name = "image"; + partitions = { + "esp" = { + contents = { + "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = + "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + + "/loader/entries/nixos.conf".source = pkgs.writeText "nixos.conf" '' + title NixOS + linux /EFI/nixos/kernel.efi + initrd /EFI/nixos/initrd.efi + options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + ''; + + "/EFI/nixos/kernel.efi".source = + "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; + + "/EFI/nixos/initrd.efi".source = + "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + }; + repartConfig = { + Type = "esp"; + Format = "vfat"; + SizeMinBytes = "96M"; + }; + }; + "root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "ext4"; + Label = "nixos"; + Minimize = "guess"; + }; + }; + }; + }; + + }) +]).image +``` diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix new file mode 100644 index 00000000000..9e7fe6932b3 --- /dev/null +++ b/nixos/modules/image/repart.nix @@ -0,0 +1,207 @@ +# This module exposes options to build a disk image with a GUID Partition Table +# (GPT). It uses systemd-repart to build the image. + +{ config, pkgs, lib, utils, ... }: + +let + cfg = config.image.repart; + + partitionOptions = { + options = { + storePaths = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = lib.mdDoc "The store paths to include in the partition."; + }; + + stripNixStorePrefix = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Whether to strip `/nix/store/` from the store paths. This is useful + when you want to build a partition that only contains store paths and + is mounted under `/nix/store`. + ''; + }; + + contents = lib.mkOption { + type = with lib.types; attrsOf (submodule { + options = { + source = lib.mkOption { + type = types.path; + description = lib.mdDoc "Path of the source file."; + }; + }; + }); + default = { }; + example = lib.literalExpression '' { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + + "/loader/entries/nixos.conf".source = systemdBootEntry; + } + ''; + description = lib.mdDoc "The contents to end up in the filesystem image."; + }; + + repartConfig = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool ]); + example = { + Type = "home"; + SizeMinBytes = "512M"; + SizeMaxBytes = "2G"; + }; + description = lib.mdDoc '' + Specify the repart options for a partiton as a structural setting. + See <https://www.freedesktop.org/software/systemd/man/repart.d.html> + for all available options. + ''; + }; + }; + }; +in +{ + options.image.repart = { + + name = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc "The name of the image."; + }; + + seed = lib.mkOption { + type = with lib.types; nullOr str; + # Generated with `uuidgen`. Random but fixed to improve reproducibility. + default = "0867da16-f251-457d-a9e8-c31f9a3c220b"; + description = lib.mdDoc '' + A UUID to use as a seed. You can set this to `null` to explicitly + randomize the partition UUIDs. + ''; + }; + + split = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enables generation of split artifacts from partitions. If enabled, for + each partition with SplitName= set, a separate output file containing + just the contents of that partition is generated. + ''; + }; + + partitions = lib.mkOption { + type = with lib.types; attrsOf (submodule partitionOptions); + default = { }; + example = lib.literalExpression '' { + "10-esp" = { + contents = { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + } + repartConfig = { + Type = "esp"; + Format = "fat"; + }; + }; + "20-root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "ext4"; + Minimize = "guess"; + }; + }; + }; + ''; + description = lib.mdDoc '' + Specify partitions as a set of the names of the partitions with their + configuration as the key. + ''; + }; + + }; + + config = { + + system.build.image = + let + fileSystemToolMapping = with pkgs; { + "vfat" = [ dosfstools mtools ]; + "ext4" = [ e2fsprogs.bin ]; + "squashfs" = [ squashfsTools ]; + "erofs" = [ erofs-utils ]; + "btrfs" = [ btrfs-progs ]; + "xfs" = [ xfsprogs ]; + }; + + fileSystems = lib.filter + (f: f != null) + (lib.mapAttrsToList (_n: v: v.repartConfig.Format or null) cfg.partitions); + + fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems; + + + makeClosure = paths: pkgs.closureInfo { rootPaths = paths; }; + + # Add the closure of the provided Nix store paths to cfg.partitions so + # that amend-repart-definitions.py can read it. + addClosure = _name: partitionConfig: partitionConfig // ( + lib.optionalAttrs + (partitionConfig.storePaths or [ ] != [ ]) + { closure = "${makeClosure partitionConfig.storePaths}/store-paths"; } + ); + + + finalPartitions = lib.mapAttrs addClosure cfg.partitions; + + + amendRepartDefinitions = pkgs.runCommand "amend-repart-definitions.py" + { + nativeBuildInputs = with pkgs; [ black ruff mypy ]; + buildInputs = [ pkgs.python3 ]; + } '' + install ${./amend-repart-definitions.py} $out + patchShebangs --host $out + + black --check --diff $out + ruff --line-length 88 $out + mypy --strict $out + ''; + + format = pkgs.formats.ini { }; + + definitionsDirectory = utils.systemdUtils.lib.definitions + "repart.d" + format + (lib.mapAttrs (_n: v: { Partition = v.repartConfig; }) finalPartitions); + + partitions = pkgs.writeText "partitions.json" (builtins.toJSON finalPartitions); + in + pkgs.runCommand cfg.name + { + nativeBuildInputs = with pkgs; [ + fakeroot + systemd + ] ++ fileSystemTools; + } '' + amendedRepartDefinitions=$(${amendRepartDefinitions} ${partitions} ${definitionsDirectory}) + + mkdir -p $out + cd $out + + fakeroot systemd-repart \ + --dry-run=no \ + --empty=create \ + --size=auto \ + --seed="${cfg.seed}" \ + --definitions="$amendedRepartDefinitions" \ + --split="${lib.boolToString cfg.split}" \ + image.raw + ''; + + meta = { + maintainers = with lib.maintainers; [ nikstur ]; + doc = ./repart.md; + }; + + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e6b6d2487d9..e4e5fa97608 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -4,8 +4,8 @@ ./config/debug-info.nix ./config/fonts/fontconfig.nix ./config/fonts/fontdir.nix - ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix + ./config/fonts/packages.nix ./config/gnu.nix ./config/gtk/gtk-icon-cache.nix ./config/i18n.nix @@ -93,8 +93,8 @@ ./hardware/tuxedo-keyboard.nix ./hardware/ubertooth.nix ./hardware/uinput.nix + ./hardware/usb-modeswitch.nix ./hardware/usb-storage.nix - ./hardware/usb-wwan.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/bumblebee.nix ./hardware/video/capture/mwprocapture.nix @@ -264,6 +264,7 @@ ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix + ./programs/wayland/wayfire.nix ./programs/weylus.nix ./programs/wireshark.nix ./programs/xastir.nix @@ -636,6 +637,7 @@ ./services/misc/etcd.nix ./services/misc/etebase-server.nix ./services/misc/etesync-dav.nix + ./services/misc/evdevremapkeys.nix ./services/misc/felix.nix ./services/misc/freeswitch.nix ./services/misc/fstrim.nix @@ -1397,6 +1399,7 @@ ./system/boot/systemd/oomd.nix ./system/boot/systemd/repart.nix ./system/boot/systemd/shutdown.nix + ./system/boot/systemd/sysupdate.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix ./system/boot/systemd/userdbd.nix diff --git a/nixos/modules/programs/hyprland.nix b/nixos/modules/programs/hyprland.nix index d79680f63f1..faeaa8973fa 100644 --- a/nixos/modules/programs/hyprland.nix +++ b/nixos/modules/programs/hyprland.nix @@ -60,7 +60,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.finalPackage ]; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; hardware.opengl.enable = mkDefault true; programs = { diff --git a/nixos/modules/programs/miriway.nix b/nixos/modules/programs/miriway.nix index a67e1a17a7e..e8a10770b6a 100644 --- a/nixos/modules/programs/miriway.nix +++ b/nixos/modules/programs/miriway.nix @@ -66,7 +66,7 @@ in { }; hardware.opengl.enable = lib.mkDefault true; - fonts.enableDefaultFonts = lib.mkDefault true; + fonts.enableDefaultPackages = lib.mkDefault true; programs.dconf.enable = lib.mkDefault true; programs.xwayland.enable = lib.mkDefault true; diff --git a/nixos/modules/programs/wayland/wayfire.nix b/nixos/modules/programs/wayland/wayfire.nix new file mode 100644 index 00000000000..d0b280e3940 --- /dev/null +++ b/nixos/modules/programs/wayland/wayfire.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.programs.wayfire; +in +{ + meta.maintainers = with lib.maintainers; [ rewine ]; + + options.programs.wayfire = { + enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots."); + + package = lib.mkPackageOptionMD pkgs "wayfire" { }; + + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = with pkgs.wayfirePlugins; [ wcm wf-shell ]; + defaultText = lib.literalExpression "with pkgs.wayfirePlugins; [ wcm wf-shell ]"; + example = lib.literalExpression '' + with pkgs.wayfirePlugins; [ + wcm + wf-shell + wayfire-plugins-extra + ]; + ''; + description = lib.mdDoc '' + Additional plugins to use with the wayfire window manager. + ''; + }; + }; + + config = let + finalPackage = pkgs.wayfire-with-plugins.override { + wayfire = cfg.package; + plugins = cfg.plugins; + }; + in + lib.mkIf cfg.enable { + environment.systemPackages = [ + finalPackage + ]; + + services.xserver.displayManager.sessionPackages = [ finalPackage ]; + + xdg.portal = { + enable = lib.mkDefault true; + wlr.enable = lib.mkDefault true; + }; + }; +} diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index 3cbfef4d61d..da117ceae0a 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -5,7 +5,7 @@ }; hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; programs = { dconf.enable = mkDefault true; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index a7016bbee3a..0acaf0fd00a 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -404,8 +404,8 @@ in { log_connections = true; log_statement = "all"; - logging_collector = true - log_disconnections = true + logging_collector = true; + log_disconnections = true; log_destination = lib.mkForce "syslog"; } ''; diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 2be46e47d64..fe3a1015979 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -96,7 +96,7 @@ in environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; - environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor"); + environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "emacseditor"); }; meta.doc = ./emacs.md; diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix index c8d89ed33f5..16c4f571da9 100644 --- a/nixos/modules/services/matrix/conduit.nix +++ b/nixos/modules/services/matrix/conduit.nix @@ -138,10 +138,12 @@ in "~@privileged" ]; StateDirectory = "matrix-conduit"; + StateDirectoryMode = "0700"; ExecStart = "${cfg.package}/bin/conduit"; Restart = "on-failure"; RestartSec = 10; StartLimitBurst = 5; + UMask = "077"; }; }; }; diff --git a/nixos/modules/services/misc/evdevremapkeys.nix b/nixos/modules/services/misc/evdevremapkeys.nix new file mode 100644 index 00000000000..11ea6a5f03f --- /dev/null +++ b/nixos/modules/services/misc/evdevremapkeys.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + format = pkgs.formats.yaml { }; + cfg = config.services.evdevremapkeys; + +in +{ + options.services.evdevremapkeys = { + enable = mkEnableOption (lib.mdDoc ''evdevremapkeys''); + + settings = mkOption { + type = format.type; + default = { }; + description = lib.mdDoc '' + config.yaml for evdevremapkeys + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "uinput" ]; + services.udev.extraRules = '' + KERNEL=="uinput", MODE="0660", GROUP="input" + ''; + users.groups.evdevremapkeys = { }; + users.users.evdevremapkeys = { + description = "evdevremapkeys service user"; + group = "evdevremapkeys"; + extraGroups = [ "input" ]; + isSystemUser = true; + }; + systemd.services.evdevremapkeys = { + description = "evdevremapkeys"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + config = format.generate "config.yaml" cfg.settings; + in + { + ExecStart = "${pkgs.evdevremapkeys}/bin/evdevremapkeys --config-file ${config}"; + User = "evdevremapkeys"; + Group = "evdevremapkeys"; + StateDirectory = "evdevremapkeys"; + Restart = "always"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateNetwork = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectSystem = true; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 8fe628a4088..1845d8ad29b 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -26,14 +26,11 @@ let lib.mapAttrs (_: toString) cfg.extraConfig ); - manage = - let - setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); - in - pkgs.writeShellScript "manage" '' - ${setupEnv} - exec ${pkg}/bin/paperless-ngx "$@" - ''; + manage = pkgs.writeShellScript "manage" '' + set -o allexport # Export the following env vars + ${lib.toShellVars env} + exec ${pkg}/bin/paperless-ngx "$@" + ''; # Secure the services defaultServiceConfig = { @@ -172,19 +169,32 @@ in description = lib.mdDoc "Web interface port."; }; + # FIXME this should become an RFC42-style settings attr extraConfig = mkOption { type = types.attrs; default = { }; description = lib.mdDoc '' Extra paperless config options. - See [the documentation](https://paperless-ngx.readthedocs.io/en/latest/configuration.html) + See [the documentation](https://docs.paperless-ngx.com/configuration/) for available options. + + Note that some options such as `PAPERLESS_CONSUMER_IGNORE_PATTERN` expect JSON values. Use `builtins.toJSON` to ensure proper quoting. + ''; + example = literalExpression '' + { + PAPERLESS_OCR_LANGUAGE = "deu+eng"; + + PAPERLESS_DBHOST = "/run/postgresql"; + + PAPERLESS_CONSUMER_IGNORE_PATTERN = builtins.toJSON [ ".DS_STORE/*" "desktop.ini" ]; + + PAPERLESS_OCR_USER_ARGS = builtins.toJSON { + optimize = 1; + pdfa_image_compression = "lossless"; + }; + }; ''; - example = { - PAPERLESS_OCR_LANGUAGE = "deu+eng"; - PAPERLESS_DBHOST = "/run/postgresql"; - }; }; user = mkOption { diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 9461bd3f35b..f37f2689927 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -375,7 +375,7 @@ in # Munin is hardcoded to use DejaVu Mono and the graphs come out wrong if # it's not available. - fonts.fonts = [ pkgs.dejavu_fonts ]; + fonts.packages = [ pkgs.dejavu_fonts ]; systemd.timers.munin-cron = { description = "batch Munin master programs"; diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix index 98524d0c700..4f6c2557a64 100644 --- a/nixos/modules/services/monitoring/osquery.nix +++ b/nixos/modules/services/monitoring/osquery.nix @@ -21,7 +21,7 @@ let osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \ - --add-flags "--flagfile ${flagfile}" + --add-flags "--flagfile ${flagfile} --disable-database" ''; in { diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 0a6c3f2a656..924abfc2953 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -921,9 +921,7 @@ in { }; config = let - bss = bssSubmod.name; bssCfg = bssSubmod.config; - pairwiseCiphers = concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers ++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"])); @@ -964,9 +962,9 @@ in { } // optionalAttrs (bssCfg.bssid != null) { bssid = bssCfg.bssid; } // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) { - accept_mac_file = "/run/hostapd/${bss}.mac.allow"; + accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow"; } // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) { - deny_mac_file = "/run/hostapd/${bss}.mac.deny"; + deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny"; } // optionalAttrs (bssCfg.authentication.mode == "none") { wpa = mkDefault 0; } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") { @@ -1051,7 +1049,6 @@ in { }; config.settings = let - radio = radioSubmod.name; radioCfg = radioSubmod.config; in { driver = radioCfg.driver; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index a4fd2fd7c89..c53d86c0bab 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -42,12 +42,15 @@ let }; passwordFile = mkOption { - type = uniq (nullOr types.path); + type = uniq (nullOr path); example = "/path/to/file"; default = null; description = lib.mdDoc '' Specifies the path to a file containing the clear text password for the MQTT user. + The file is securely passed to mosquitto by + leveraging systemd credentials. No special + permissions need to be set on this file. ''; }; @@ -64,7 +67,7 @@ let }; hashedPasswordFile = mkOption { - type = uniq (nullOr types.path); + type = uniq (nullOr path); example = "/path/to/file"; default = null; description = mdDoc '' @@ -73,6 +76,9 @@ let To generate hashed password install the `mosquitto` package and use `mosquitto_passwd`, then remove the `username:` prefix from the generated file. + The file is securely passed to mosquitto by + leveraging systemd credentials. No special + permissions need to be set on this file. ''; }; @@ -102,15 +108,43 @@ let message = "Cannot set more than one password option for user ${n} in ${prefix}"; }) users; - makePasswordFile = users: path: + listenerScope = index: "listener-${toString index}"; + userScope = prefix: index: "${prefix}-user-${toString index}"; + credentialID = prefix: credential: "${prefix}-${credential}"; + + toScopedUsers = listenerScope: users: pipe users [ + attrNames + (imap0 (index: user: nameValuePair user + (users.${user} // { scope = userScope listenerScope index; }) + )) + listToAttrs + ]; + + userCredentials = user: credentials: pipe credentials [ + (filter (credential: user.${credential} != null)) + (map (credential: "${credentialID user.scope credential}:${user.${credential}}")) + ]; + usersCredentials = listenerScope: users: credentials: pipe users [ + (toScopedUsers listenerScope) + (mapAttrsToList (_: user: userCredentials user credentials)) + concatLists + ]; + systemdCredentials = listeners: listenerCredentials: pipe listeners [ + (imap0 (index: listener: listenerCredentials (listenerScope index) listener)) + concatLists + ]; + + makePasswordFile = listenerScope: users: path: let - makeLines = store: file: + makeLines = store: file: let + scopedUsers = toScopedUsers listenerScope users; + in mapAttrsToList - (n: u: "addLine ${escapeShellArg n} ${escapeShellArg u.${store}}") - (filterAttrs (_: u: u.${store} != null) users) + (name: user: ''addLine ${escapeShellArg name} "''$(systemd-creds cat ${credentialID user.scope store})"'') + (filterAttrs (_: user: user.${store} != null) scopedUsers) ++ mapAttrsToList - (n: u: "addFile ${escapeShellArg n} ${escapeShellArg "${u.${file}}"}") - (filterAttrs (_: u: u.${file} != null) users); + (name: user: ''addFile ${escapeShellArg name} "''${CREDENTIALS_DIRECTORY}/${credentialID user.scope file}"'') + (filterAttrs (_: user: user.${file} != null) scopedUsers); plainLines = makeLines "password" "passwordFile"; hashedLines = makeLines "hashedPassword" "hashedPasswordFile"; in @@ -581,6 +615,19 @@ in ExecStart = "${cfg.package}/bin/mosquitto -c ${configFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + # Credentials + SetCredential = let + listenerCredentials = listenerScope: listener: + usersCredentials listenerScope listener.users [ "password" "hashedPassword" ]; + in + systemdCredentials cfg.listeners listenerCredentials; + + LoadCredential = let + listenerCredentials = listenerScope: listener: + usersCredentials listenerScope listener.users [ "passwordFile" "hashedPasswordFile" ]; + in + systemdCredentials cfg.listeners listenerCredentials; + # Hardening CapabilityBoundingSet = ""; DevicePolicy = "closed"; @@ -653,7 +700,7 @@ in concatStringsSep "\n" (imap0 - (idx: listener: makePasswordFile listener.users "${cfg.dataDir}/passwd-${toString idx}") + (idx: listener: makePasswordFile (listenerScope idx) listener.users "${cfg.dataDir}/passwd-${toString idx}") cfg.listeners); }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 3b28cec83cb..e28f96f7a6d 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -461,6 +461,8 @@ in { "d /var/lib/NetworkManager-fortisslvpn 0700 root root -" "d /var/lib/misc 0755 root root -" # for dnsmasq.leases + # ppp isn't able to mkdir that directory at runtime + "d /run/pppd/lock 0700 root root -" ]; systemd.services.NetworkManager = { diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index ed7f1dadd37..218b440aab3 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -121,7 +121,7 @@ in icons.enable = true; }; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; systemd = { services.xrdp = { diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 1d98e7ddacc..0a12ef48d08 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -111,7 +111,7 @@ in { fonts = mkIf (cfg.fonts != null) { fontconfig.enable = true; - fonts = map (f: f.package) cfg.fonts; + packages = map (f: f.package) cfg.fonts; }; }; } diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 217637cbebc..8db2bfae80a 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -322,6 +322,16 @@ in ''; }; + systemd.services.nginx.serviceConfig.SupplementaryGroups = [ + "frigate" + ]; + + users.users.frigate = { + isSystemUser = true; + group = "frigate"; + }; + users.groups.frigate = {}; + systemd.services.frigate = { after = [ "go2rtc.service" @@ -349,15 +359,18 @@ in serviceConfig = { ExecStart = "${cfg.package.python.interpreter} -m frigate"; - DynamicUser = true; User = "frigate"; + Group = "frigate"; + + UMask = "0027"; StateDirectory = "frigate"; - UMask = "0077"; + StateDirectoryMode = "0750"; # Caches PrivateTmp = true; CacheDirectory = "frigate"; + CacheDirectoryMode = "0750"; BindPaths = [ "/migrations:${cfg.package}/share/frigate/migrations:ro" diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 330dce1d0c0..cf4c0798cd4 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -23,6 +23,15 @@ in { example = ["-d"]; }; + options.services.cage.environment = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + WLR_LIBINPUT_NO_DEVICES = "1"; + }; + description = lib.mdDoc "Additional environment variables to pass to Cage."; + }; + options.services.cage.program = mkOption { type = types.path; default = "${pkgs.xterm}/bin/xterm"; @@ -79,6 +88,7 @@ in { # Set up a full (custom) user session for the user, required by Cage. PAMName = "cage"; }; + environment = cfg.environment; }; security.polkit.enable = true; diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index a8ad4c50f2f..6dfba907fb5 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, utils, ... }: with lib; let cfg = config.services.lemmy; @@ -41,6 +41,30 @@ in default = null; description = lib.mdDoc "The connection URI to use. Takes priority over the configuration file if set."; }; + + uriFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the database uri."; + }; + }; + + pictrsApiKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the value of `pictrs.api_key`."; + }; + + smtpPasswordFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the value of `email.smtp_password`."; + }; + + adminPasswordFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the value of `setup.admin_password`."; }; settings = mkOption { @@ -76,17 +100,20 @@ in }; }; }; - - secretFile = mkOption { - type = with types; nullOr path; - default = null; - description = lib.mdDoc "Path to a secret JSON configuration file which is merged at runtime with the one generated from {option}`services.lemmy.settings`."; - }; }; config = + let + secretOptions = { + pictrsApiKeyFile = { setting = [ "pictrs" "api_key" ]; path = cfg.pictrsApiKeyFile; }; + smtpPasswordFile = { setting = [ "email" "smtp_password" ]; path = cfg.smtpPasswordFile; }; + adminPasswordFile = { setting = [ "setup" "admin_password" ]; path = cfg.adminPasswordFile; }; + uriFile = { setting = [ "database" "uri" ]; path = cfg.database.uriFile; }; + }; + secrets = lib.filterAttrs (option: data: data.path != null) secretOptions; + in lib.mkIf cfg.enable { - services.lemmy.settings = (mapAttrs (name: mkDefault) + services.lemmy.settings = lib.attrsets.recursiveUpdate (mapAttrs (name: mkDefault) { bind = "127.0.0.1"; tls_enabled = true; @@ -104,14 +131,15 @@ in rate_limit.image = 6; rate_limit.image_per_second = 3600; } // { - database = mapAttrs (name: mkDefault) { - user = "lemmy"; - host = "/run/postgresql"; - port = 5432; - database = "lemmy"; - pool_size = 5; - }; - }); + database = mapAttrs (name: mkDefault) { + user = "lemmy"; + host = "/run/postgresql"; + port = 5432; + database = "lemmy"; + pool_size = 5; + }; + }) (lib.foldlAttrs (acc: option: data: acc // lib.setAttrByPath data.setting { _secret = option; }) {} secrets); + # the option name is the id of the credential loaded by LoadCredential services.postgresql = mkIf cfg.database.createLocally { enable = true; @@ -202,16 +230,19 @@ in assertion = (!(hasAttrByPath ["federation"] cfg.settings)) && (!(hasAttrByPath ["federation" "enabled"] cfg.settings)); message = "`services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect"; } + { + assertion = cfg.database.uriFile != null -> cfg.database.uri == null && !cfg.database.createLocally; + message = "specifying a database uri while also specifying a database uri file is not allowed"; + } ]; systemd.services.lemmy = let - configFile = settingsFormat.generate "config.hjson" cfg.settings; - mergedConfig = "/run/lemmy/config.hjson"; + substitutedConfig = "/run/lemmy/config.hjson"; in { description = "Lemmy server"; environment = { - LEMMY_CONFIG_LOCATION = if cfg.secretFile == null then configFile else mergedConfig; + LEMMY_CONFIG_LOCATION = if secrets == {} then settingsFormat.generate "config.hjson" cfg.settings else substitutedConfig; LEMMY_DATABASE_URL = if cfg.database.uri != null then cfg.database.uri else (mkIf (cfg.database.createLocally) "postgres:///lemmy?host=/run/postgresql&user=lemmy"); }; @@ -226,21 +257,20 @@ in requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ]; - path = mkIf (cfg.secretFile != null) [ pkgs.jq ]; - - # merge the two configs and prevent others from reading the result + # substitute secrets and prevent others from reading the result # if somehow $CREDENTIALS_DIRECTORY is not set we fail - preStart = mkIf (cfg.secretFile != null) '' + preStart = mkIf (secrets != {}) '' set -u - umask 177 - jq --slurp '.[0] * .[1]' ${lib.escapeShellArg configFile} "$CREDENTIALS_DIRECTORY/secretFile" > ${lib.escapeShellArg mergedConfig} + umask u=rw,g=,o= + cd "$CREDENTIALS_DIRECTORY" + ${utils.genJqSecretsReplacementSnippet cfg.settings substitutedConfig} ''; serviceConfig = { DynamicUser = true; RuntimeDirectory = "lemmy"; ExecStart = "${cfg.server.package}/bin/lemmy_server"; - LoadCredential = mkIf (cfg.secretFile != null) "secretFile:${toString cfg.secretFile}"; + LoadCredential = lib.foldlAttrs (acc: option: data: acc ++ [ "${option}:${toString data.path}" ]) [] secrets; PrivateTmp = true; MemoryDenyWriteExecute = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/web-apps/sogo.nix b/nixos/modules/services/web-apps/sogo.nix index 5e5d9472829..9427eff35d1 100644 --- a/nixos/modules/services/web-apps/sogo.nix +++ b/nixos/modules/services/web-apps/sogo.nix @@ -232,8 +232,8 @@ in { proxy_connect_timeout 90; proxy_send_timeout 90; proxy_read_timeout 90; - proxy_buffer_size 4k; - proxy_buffers 4 32k; + proxy_buffer_size 64k; + proxy_buffers 8 64k; proxy_busy_buffers_size 64k; proxy_temp_file_write_size 64k; client_max_body_size 50m; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index e87159ba99c..74a00f20b65 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -362,7 +362,9 @@ let redirectListen = filter (x: !x.ssl) defaultListen; - acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) '' + # The acme-challenge location doesn't need to be added if we are not using any automated + # certificate provisioning and can also be omitted when we use a certificate obtained via a DNS-01 challenge + acmeLocation = optionalString (vhost.enableACME || (vhost.useACMEHost != null && config.security.acme.certs.${vhost.useACMEHost}.dnsProvider == null)) '' # Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx) # We use ^~ here, so that we don't check any regexes (which could # otherwise easily override this intended match accidentally). diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index b7341d4d8b4..a734bc288c9 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -156,7 +156,7 @@ in { ++ cfg.sessionPath; # Fonts. - fonts.fonts = mkDefault [ + fonts.packages = mkDefault [ pkgs.noto-fonts pkgs.hack-font ]; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index c7755aca4bb..b3cbe4c324d 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -218,7 +218,7 @@ in qt.style = "adwaita"; # Default Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ source-code-pro # Default monospace font in 3.32 ubuntu_font_family # required for default theme ]; diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 70be6ed7c05..b2369e2426f 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -67,7 +67,7 @@ in networking.networkmanager.enable = mkDefault true; programs.dconf.enable = mkDefault true; - fonts.fonts = with pkgs; [ noto-fonts ]; + fonts.packages = with pkgs; [ noto-fonts ]; xdg.mime.enable = true; xdg.menus.enable = true; xdg.icons.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 2de5d845d68..1512b5fdf8a 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -92,7 +92,7 @@ in environment.etc."X11/xkb".source = xcfg.xkbDir; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; + fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 79b2e7c6ead..5d950f7d7fc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -432,7 +432,7 @@ in isSystem = true; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ cantarell-fonts dejavu_fonts source-code-pro # Default monospace font in 3.32 diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e87ae5ae812..d8a47e93afc 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -199,6 +199,7 @@ in gnome.adwaita-icon-theme gtk3.out # for gtk-launch program onboard + orca # elementary/greeter#668 qgnomeplatform sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ @@ -265,7 +266,7 @@ in qt.style = "adwaita"; # Default Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ inter open-dyslexic open-sans @@ -306,7 +307,7 @@ in ])) config.environment.pantheon.excludePackages; # needed by screenshot - fonts.fonts = [ + fonts.packages = [ pkgs.pantheon.elementary-redacted-script ]; }) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 38f932ffb42..15a510fd8f9 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -332,7 +332,7 @@ in # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; - fonts.fonts = with pkgs; [ cfg.notoPackage hack-font ]; + fonts.packages = with pkgs; [ cfg.notoPackage hack-font ]; fonts.fontconfig.defaultFonts = { monospace = [ "Hack" "Noto Sans Mono" ]; sansSerif = [ "Noto Sans" ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index eee1f63ebdc..191b3690c02 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -1,9 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let cfg = config.services.xserver.desktopManager.xfce; + excludePackages = config.environment.xfce.excludePackages; in { @@ -69,10 +70,17 @@ in description = lib.mdDoc "Enable the XFCE screensaver."; }; }; + + environment.xfce.excludePackages = mkOption { + default = []; + example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; + type = types.listOf types.package; + description = lib.mdDoc "Which packages XFCE should exclude from the default environment"; + }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs.xfce // pkgs; [ + environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [ glib # for gsettings gtk3.out # gtk-update-icon-cache @@ -121,7 +129,7 @@ in ] ++ optionals (!cfg.noDesktop) [ xfce4-panel xfdesktop - ] ++ optional cfg.enableScreensaver xfce4-screensaver; + ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages; programs.xfconf.enable = true; programs.thunar.enable = true; @@ -165,9 +173,9 @@ in programs.zsh.vteIntegration = mkDefault true; # Systemd services - systemd.packages = with pkgs.xfce; [ + systemd.packages = utils.removePackagesByName (with pkgs.xfce; [ xfce4-notifyd - ]; + ]) excludePackages; security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index 4456374cc56..ee9b4016c8e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -142,7 +142,7 @@ in theme ]; - fonts.fonts = [ font ]; + fonts.packages = [ font ]; environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 53d9c99b47d..c2e6da4b453 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -22,7 +22,7 @@ let }; fontsForXServer = - config.fonts.fonts ++ + config.fonts.packages ++ # We don't want these fonts in fonts.conf, because then modern, # fontconfig-based applications will get horrible bitmapped # Helvetica fonts. It's better to get a substitution (like Nimbus @@ -883,8 +883,8 @@ in ${cfg.extraConfig} ''; - fonts.enableDefaultFonts = mkDefault true; - fonts.fonts = [ + fonts.enableDefaultPackages = mkDefault true; + fonts.packages = [ (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) pkgs.xorg.fontmiscmisc ]; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 66b54155fbf..8f2f578e307 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -40,7 +40,10 @@ let backgroundColor = f cfg.backgroundColor; entryOptions = f cfg.entryOptions; subEntryOptions = f cfg.subEntryOptions; - grub = f grub; + # PC platforms (like x86_64-linux) have a non-EFI target (`grubTarget`), but other platforms + # (like aarch64-linux) have an undefined `grubTarget`. Avoid providing the path to a non-EFI + # GRUB on those platforms. + grub = f (if (grub.grubTarget or "") != "" then grub else ""); grubTarget = f (grub.grubTarget or ""); shell = "${pkgs.runtimeShell}"; fullName = lib.getName realGrub; diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index e81b3e4ff2a..2431c68ea17 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -1,28 +1,15 @@ -{ config, pkgs, lib, utils, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.systemd.repart; initrdCfg = config.boot.initrd.systemd.repart; - writeDefinition = name: partitionConfig: pkgs.writeText - "${name}.conf" - (lib.generators.toINI { } { Partition = partitionConfig; }); - - listOfDefinitions = lib.mapAttrsToList - writeDefinition - (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions); - - # Create a directory in the store that contains a copy of all definition - # files. This is then passed to systemd-repart in the initrd so it can access - # the definition files after the sysroot has been mounted but before - # activation. This needs a hard copy of the files and not just symlinks - # because otherwise the files do not show up in the sysroot. - definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } '' - mkdir -p $out - ${(lib.concatStringsSep "\n" - (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions) - )} - ''; + format = pkgs.formats.ini { }; + + definitionsDirectory = utils.systemdUtils.lib.definitions + "repart.d" + format + (lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions); in { options = { diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix new file mode 100644 index 00000000000..b1914a9c4e7 --- /dev/null +++ b/nixos/modules/system/boot/systemd/sysupdate.nix @@ -0,0 +1,136 @@ +{ config, lib, pkgs, utils, ... }: + +let + cfg = config.systemd.sysupdate; + + format = pkgs.formats.ini { }; + + definitionsDirectory = utils.systemdUtils.lib.definitions + "sysupdate.d" + format + cfg.transfers; +in +{ + options.systemd.sysupdate = { + + enable = lib.mkEnableOption (lib.mdDoc "systemd-sysupdate") // { + description = lib.mdDoc '' + Atomically update the host OS, container images, portable service + images or other sources. + + If enabled, updates are triggered in regular intervals via a + `systemd.timer` unit. + + Please see + <https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html> + for more details. + ''; + }; + + timerConfig = utils.systemdUtils.unitOptions.timerOptions.options.timerConfig // { + default = { }; + description = lib.mdDoc '' + The timer configuration for performing the update. + + By default, the upstream configuration is used: + <https://github.com/systemd/systemd/blob/main/units/systemd-sysupdate.timer> + ''; + }; + + reboot = { + enable = lib.mkEnableOption (lib.mdDoc "automatically rebooting after an update") // { + description = lib.mdDoc '' + Whether to automatically reboot after an update. + + If set to `true`, the system will automatically reboot via a + `systemd.timer` unit but only after a new version was installed. + + This uses a unit completely separate from the one performing the + update because it is typically advisable to download updates + regularly while the system is up, but delay reboots until the + appropriate time (i.e. typically at night). + + Set this to `false` if you do not want to reboot after an update. This + is useful when you update a container image or another source where + rebooting is not necessary in order to finalize the update. + ''; + }; + + timerConfig = utils.systemdUtils.unitOptions.timerOptions.options.timerConfig // { + default = { }; + description = lib.mdDoc '' + The timer configuration for rebooting after an update. + + By default, the upstream configuration is used: + <https://github.com/systemd/systemd/blob/main/units/systemd-sysupdate-reboot.timer> + ''; + }; + }; + + transfers = lib.mkOption { + type = with lib.types; attrsOf format.type; + default = { }; + example = { + "10-uki.conf" = { + Transfer = { + ProtectVersion = "%A"; + }; + + Source = { + Type = "url-file"; + Path = "https://download.example.com/"; + MatchPattern = "nixos_@v.efi.xz"; + }; + + Target = { + Type = "regular-file"; + Path = "/EFI/Linux"; + PathRelativeTo = "boot"; + MatchPattern = '' + nixos_@v+@l-@d.efi"; \ + nixos_@v+@l.efi \ + nixos_@v.efi + ''; + Mode = "0444"; + TriesLeft = 3; + TriesDone = 0; + InstancesMax = 2; + }; + }; + }; + description = lib.mdDoc '' + Specify transfers as a set of the names of the transfer files as the + key and the configuration as its value. The configuration can use all + upstream options. See + <https://www.freedesktop.org/software/systemd/man/sysupdate.d.html> + for all available options. + ''; + }; + + }; + + config = lib.mkIf cfg.enable { + + systemd.additionalUpstreamSystemUnits = [ + "systemd-sysupdate.service" + "systemd-sysupdate.timer" + "systemd-sysupdate-reboot.service" + "systemd-sysupdate-reboot.timer" + ]; + + systemd.timers = { + "systemd-sysupdate" = { + wantedBy = [ "timers.target" ]; + timerConfig = cfg.timerConfig; + }; + "systemd-sysupdate-reboot" = lib.mkIf cfg.reboot.enable { + wantedBy = [ "timers.target" ]; + timerConfig = cfg.reboot.timerConfig; + }; + }; + + environment.etc."sysupdate.d".source = definitionsDirectory; + }; + + meta.maintainers = with lib.maintainers; [ nikstur ]; +} diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index cfb9c39458e..ea61e7384e6 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -173,7 +173,7 @@ in config = { target = mkDefault name; source = mkIf (config.text != null) ( - let name' = "etc-" + baseNameOf name; + let name' = "etc-" + lib.replaceStrings ["/"] ["-"] name; in mkDerivedConfig options.text (pkgs.writeText name') ); }; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 046b8e2f790..20f47a76c87 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -158,6 +158,15 @@ in Docker package to be used in the module. ''; }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression "with pkgs; [ criu ]"; + description = lib.mdDoc '' + Extra packages to add to PATH for the docker daemon process. + ''; + }; }; ###### implementation @@ -194,7 +203,8 @@ in }; path = [ pkgs.kmod ] ++ optional (cfg.storageDriver == "zfs") pkgs.zfs - ++ optional cfg.enableNvidia pkgs.nvidia-docker; + ++ optional cfg.enableNvidia pkgs.nvidia-docker + ++ cfg.extraPackages; }; systemd.sockets.docker = { diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 1074b02d0eb..1ea5434c842 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -69,6 +69,34 @@ with lib; VM name ''; }; + additionalSpace = mkOption { + type = types.str; + default = "512M"; + example = "2048M"; + description = lib.mdDoc '' + additional disk space to be added to the image if diskSize "auto" + is used. + ''; + }; + bootSize = mkOption { + type = types.str; + default = "256M"; + example = "512M"; + description = lib.mdDoc '' + Size of the boot partition. Is only used if partitionTableType is + either "efi" or "hybrid". + ''; + }; + diskSize = mkOption { + type = types.str; + default = "auto"; + example = "20480"; + description = lib.mdDoc '' + The size of the disk, in megabytes. + if "auto" size is calculated based on the contents copied to it and + additionalSpace is taken into account. + ''; + }; net0 = mkOption { type = types.commas; default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1"; @@ -236,6 +264,7 @@ with lib; mkdir -p $out/nix-support echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" >> $out/nix-support/hydra-build-products ''; + inherit (cfg.qemuConf) additionalSpace diskSize bootSize; format = "raw"; inherit config lib pkgs; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9ab0bfb21f4..c707200def0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -112,6 +112,7 @@ in { anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; + appliance-repart-image = runTest ./appliance-repart-image.nix; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; @@ -772,6 +773,7 @@ in { systemd-portabled = handleTest ./systemd-portabled.nix {}; systemd-repart = handleTest ./systemd-repart.nix {}; systemd-shutdown = handleTest ./systemd-shutdown.nix {}; + systemd-sysupdate = runTest ./systemd-sysupdate.nix; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {}; systemd-misc = handleTest ./systemd-misc.nix {}; diff --git a/nixos/tests/appliance-repart-image.nix b/nixos/tests/appliance-repart-image.nix new file mode 100644 index 00000000000..3f256db8462 --- /dev/null +++ b/nixos/tests/appliance-repart-image.nix @@ -0,0 +1,116 @@ +# Tests building and running a GUID Partition Table (GPT) appliance image. +# "Appliance" here means that the image does not contain the normal NixOS +# infrastructure of a system profile and cannot be re-built via +# `nixos-rebuild`. + +{ lib, ... }: + +let + rootPartitionLabel = "root"; + + bootLoaderConfigPath = "/loader/entries/nixos.conf"; + kernelPath = "/EFI/nixos/kernel.efi"; + initrdPath = "/EFI/nixos/initrd.efi"; +in +{ + name = "appliance-gpt-image"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { config, lib, pkgs, ... }: { + + imports = [ ../modules/image/repart.nix ]; + + virtualisation.directBoot.enable = false; + virtualisation.mountHostNixStore = false; + virtualisation.useEFIBoot = true; + + # Disable boot loaders because we install one "manually". + # TODO(raitobezarius): revisit this when #244907 lands + boot.loader.grub.enable = false; + + virtualisation.fileSystems = lib.mkForce { + "/" = { + device = "/dev/disk/by-partlabel/${rootPartitionLabel}"; + fsType = "ext4"; + }; + }; + + image.repart = { + name = "appliance-gpt-image"; + partitions = { + "esp" = { + contents = + let + efiArch = config.nixpkgs.hostPlatform.efiArch; + in + { + "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = + "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + + # TODO: create an abstraction for Boot Loader Specification (BLS) entries. + "${bootLoaderConfigPath}".source = pkgs.writeText "nixos.conf" '' + title NixOS + linux ${kernelPath} + initrd ${initrdPath} + options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + ''; + + "${kernelPath}".source = + "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; + + "${initrdPath}".source = + "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + }; + repartConfig = { + Type = "esp"; + Format = "vfat"; + # Minimize = "guess" seems to not work very vell for vfat + # partitons. It's better to set a sensible default instead. The + # aarch64 kernel seems to generally be a little bigger than the + # x86_64 kernel. To stay on the safe side, leave some more slack + # for every platform other than x86_64. + SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; + }; + }; + "root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = config.fileSystems."/".fsType; + Label = rootPartitionLabel; + Minimize = "guess"; + }; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + import os + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.image}/image.raw", + "-F", + "raw", + tmp_disk_image.name, + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + bootctl_status = machine.succeed("bootctl status") + assert "${bootLoaderConfigPath}" in bootctl_status + assert "${kernelPath}" in bootctl_status + assert "${initrdPath}" in bootctl_status + ''; +} diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index db1b7854673..3b49185124f 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { imports = [ ./common/user-account.nix ]; - fonts.fonts = with pkgs; [ dejavu_fonts ]; + fonts.packages = with pkgs; [ dejavu_fonts ]; services.cage = { enable = true; diff --git a/nixos/tests/common/gpg-keyring.nix b/nixos/tests/common/gpg-keyring.nix new file mode 100644 index 00000000000..fb8d07b1183 --- /dev/null +++ b/nixos/tests/common/gpg-keyring.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: + +pkgs.runCommand "gpg-keyring" { nativeBuildInputs = [ pkgs.gnupg ]; } '' + mkdir -p $out + export GNUPGHOME=$out + cat > foo <<EOF + %echo Generating a basic OpenPGP key + %no-protection + Key-Type: EdDSA + Key-Curve: ed25519 + Name-Real: Bob Foobar + Name-Email: bob@foo.bar + Expire-Date: 0 + # Do a commit here, so that we can later print "done" + %commit + %echo done + EOF + gpg --batch --generate-key foo + rm $out/S.gpg-agent $out/S.gpg-agent.* + gpg --export bob@foo.bar -a > $out/pubkey.gpg +'' diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix index 957b0296a75..5602193b040 100644 --- a/nixos/tests/cups-pdf.nix +++ b/nixos/tests/cups-pdf.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { nodes.machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; environment.systemPackages = [ pkgs.poppler_utils ]; - fonts.fonts = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf + fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf services.printing.cups-pdf.enable = true; services.printing.cups-pdf.instances = { opt = {}; diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index 664afc9bf44..d8c6ea0f721 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -7,8 +7,8 @@ import ./make-test-python.nix ({ lib, ... }: ]; nodes.machine = { config, pkgs, ... }: { - fonts.enableDefaultFonts = true; # Background fonts - fonts.fonts = with pkgs; [ + fonts.enableDefaultPackages = true; # Background fonts + fonts.packages = with pkgs; [ noto-fonts-emoji cantarell-fonts twitter-color-emoji diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index b8926cfa354..b747659de82 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -37,9 +37,25 @@ let package = giteaPackage; settings.service.DISABLE_REGISTRATION = true; settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; + settings.actions.ENABLED = true; }; environment.systemPackages = [ giteaPackage pkgs.gnupg pkgs.jq ]; services.openssh.enable = true; + + specialisation.runner = { + inheritParentConfig = true; + + configuration.services.gitea-actions-runner.instances."test" = { + enable = true; + name = "ci"; + url = "http://localhost:3000"; + labels = [ + # don't require docker/podman + "native:host" + ]; + tokenFile = "/var/lib/gitea/runner_token"; + }; + }; }; client1 = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; @@ -49,8 +65,9 @@ let }; }; - testScript = let + testScript = { nodes, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + serverSystem = nodes.server.system.build.toplevel; in '' GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no" REPO = "gitea@server:test/repo" @@ -125,6 +142,14 @@ let 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits ' + '-H "Accept: application/json" | jq length)" = "1"' ) + + with subtest("Testing runner registration"): + server.succeed( + "su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/gitea/runner_token" + ) + server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test") + server.wait_for_unit("gitea-runner-test.service") + server.succeed("journalctl -o cat -u gitea-runner-test.service | grep -q 'Runner registered successfully'") ''; }); in diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index a1ede6dc917..a8f62100065 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -73,8 +73,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = { nodes, ... }: let - configWithoutJobs = "${nodes.master.config.system.build.toplevel}/specialisation/noJenkinsJobs"; - jenkinsPort = nodes.master.config.services.jenkins.port; + configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs"; + jenkinsPort = nodes.master.services.jenkins.port; jenkinsUrl = "http://localhost:${toString jenkinsPort}"; in '' start_all() diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 47b5ccb68cc..e4a8e06df1e 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,7 +31,6 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_1_hardened - linux_6_3_hardened linux_6_4_hardened linux_rt_5_4 linux_rt_5_10 diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index 8845777322c..de2c4938fe2 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -26,17 +26,11 @@ in admin_email = "mightyiam@example.com"; }; }; - secretFile = /etc/lemmy-config.hjson; + adminPasswordFile = /etc/lemmy-admin-password.txt; caddy.enable = true; }; - environment.etc."lemmy-config.hjson".text = '' - { - "setup": { - "admin_password": "ThisIsWhatIUseEverywhereTryIt" - } - } - ''; + environment.etc."lemmy-admin-password.txt".text = "ThisIsWhatIUseEverywhereTryIt"; networking.firewall.allowedTCPPorts = [ 80 ]; diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index 9000e927819..f12c4d5ecc4 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -83,7 +83,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; }; - fonts.fonts = [ pkgs.inconsolata ]; + fonts.packages = [ pkgs.inconsolata ]; }; enableOCR = true; diff --git a/nixos/tests/noto-fonts-cjk-qt-default-weight.nix b/nixos/tests/noto-fonts-cjk-qt-default-weight.nix index 678013cf3ab..c2e0cb3adae 100644 --- a/nixos/tests/noto-fonts-cjk-qt-default-weight.nix +++ b/nixos/tests/noto-fonts-cjk-qt-default-weight.nix @@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { nodes.machine = { imports = [ ./common/x11.nix ]; fonts = { - enableDefaultFonts = false; + enableDefaultPackages = false; fonts = [ pkgs.noto-fonts-cjk-sans ]; }; }; diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index 893522df24f..edbb0db4cb7 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.gedit ]; fonts = { - enableDefaultFonts = false; + enableDefaultPackages = false; fonts = with pkgs;[ noto-fonts noto-fonts-cjk-sans diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index d95334c10e4..695d4a77081 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -51,7 +51,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ''; }; - fonts.fonts = [ pkgs.inconsolata ]; + fonts.packages = [ pkgs.inconsolata ]; # Automatically configure and start Sway when logging in on tty1: programs.bash.loginShellInit = '' diff --git a/nixos/tests/systemd-nspawn.nix b/nixos/tests/systemd-nspawn.nix index bc77ee2a4d1..1a4251ef069 100644 --- a/nixos/tests/systemd-nspawn.nix +++ b/nixos/tests/systemd-nspawn.nix @@ -1,26 +1,6 @@ import ./make-test-python.nix ({pkgs, lib, ...}: let - gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' - mkdir -p $out - export GNUPGHOME=$out - cat > foo <<EOF - %echo Generating a basic OpenPGP key - %no-protection - Key-Type: DSA - Key-Length: 1024 - Subkey-Type: ELG-E - Subkey-Length: 1024 - Name-Real: Bob Foobar - Name-Email: bob@foo.bar - Expire-Date: 0 - # Do a commit here, so that we can later print "done" - %commit - %echo done - EOF - gpg --batch --generate-key foo - rm $out/S.gpg-agent $out/S.gpg-agent.* - gpg --export bob@foo.bar -a > $out/pubkey.gpg - ''); + gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; }; nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' mkdir -p $out diff --git a/nixos/tests/systemd-sysupdate.nix b/nixos/tests/systemd-sysupdate.nix new file mode 100644 index 00000000000..37811605dbb --- /dev/null +++ b/nixos/tests/systemd-sysupdate.nix @@ -0,0 +1,66 @@ +# Tests downloading a signed update aritfact from a server to a target machine. +# This test does not rely on the `systemd.timer` units provided by the +# `systemd-sysupdate` module but triggers the `systemd-sysupdate` service +# manually to make the test more robust. + +{ lib, pkgs, ... }: + +let + gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; }; +in +{ + name = "systemd-sysupdate"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes = { + server = { pkgs, ... }: { + networking.firewall.enable = false; + services.nginx = { + enable = true; + virtualHosts."server" = { + root = pkgs.runCommand "sysupdate-artifacts" { buildInputs = [ pkgs.gnupg ]; } '' + mkdir -p $out + cd $out + + echo "nixos" > nixos_1.efi + sha256sum nixos_1.efi > SHA256SUMS + + export GNUPGHOME="$(mktemp -d)" + cp -R ${gpgKeyring}/* $GNUPGHOME + + gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS + ''; + }; + }; + }; + + target = { + systemd.sysupdate = { + enable = true; + transfers = { + "uki" = { + Source = { + Type = "url-file"; + Path = "http://server/"; + MatchPattern = "nixos_@v.efi"; + }; + Target = { + Path = "/boot/EFI/Linux"; + MatchPattern = "nixos_@v.efi"; + }; + }; + }; + }; + + environment.etc."systemd/import-pubring.gpg".source = "${gpgKeyring}/pubkey.gpg"; + }; + }; + + testScript = '' + server.wait_for_unit("nginx.service") + + target.succeed("systemctl start systemd-sysupdate") + assert "nixos" in target.wait_until_succeeds("cat /boot/EFI/Linux/nixos_1.efi", timeout=5) + ''; +} diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 3eda8b6cfb2..d817ce927ff 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -8,7 +8,7 @@ let environment.variables.NIXOS_OZONE_WL = "1"; environment.variables.DISPLAY = "do not use"; - fonts.fonts = with pkgs; [ dejavu_fonts ]; + fonts.packages = with pkgs; [ dejavu_fonts ]; }; xorg = { pkgs, ... }: { imports = [ ./common/user-account.nix ./common/x11.nix ]; diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 4f000df922c..8c701ca7d5f 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -34,6 +34,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: ssid = "nixos-test-mixed"; authentication = { mode = "wpa3-sae-transition"; + saeAddToMacAllow = true; saePasswordsFile = pkgs.writeText "password" "reproducibility"; wpaPasswordFile = pkgs.writeText "password" "reproducibility"; }; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 2e2a2894607..75aef2b2792 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0"; + version = "5.0.4"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-0/S/aNoQA1nAdnr8nUWVLwzrDm+MHqmGIIjPW5YIr7s="; + sha256 = "sha256-IkhUkKO+Ay1WceZNekII6aHLOmgcgGfx0hGo5ldFE5Y="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix index e9d88d1f236..f0fde190db9 100644 --- a/pkgs/applications/audio/hushboard/default.nix +++ b/pkgs/applications/audio/hushboard/default.nix @@ -26,10 +26,10 @@ buildPythonApplication { nativeBuildInputs = [ wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libappindicator libpulseaudio diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index b536de637ac..004823ee52d 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -1,16 +1,16 @@ { lib -, python3 , fetchPypi +, python3 }: python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.67"; + version = "2.0.69"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lFxAMjglQZXCySr83PtvStU6hw2ucQu+rSjIHo1yZBk="; + hash = "sha256-gkO6XYiPMkU/zRLvc0yd3jJXVcAgAkR1W1ELTSN461o="; }; postPatch = '' @@ -52,7 +52,7 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects"; + description = "Network based LED effect controller with support for advanced real-time audio effects"; homepage = "https://github.com/LedFx/LedFx"; changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; license = licenses.gpl3Only; diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index 055662ce743..888087afb79 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -34,9 +34,9 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ toml pygobject3 ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 gobject-introspection sox ]; + buildInputs = [ gtk3 sox ]; dontWrapGApps = true; makeWrapperArgs = [ diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index ef0c514bce9..0ddebe704f0 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.80"; + version = "6.81"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-By97OxGC9YO7yEHzSjDAZHCtVaub1wNwWMOn4F+Qzpg="; - aarch64-linux = "sha256-11DiFfqULIi4tespho+yOH+Qy4s+lithCt19kb4RfhI="; + x86_64-linux = "sha256-Zzt/g96yAztE0NjVa4uaWXBckSvnGxP0K87Hmq82Mi0="; + aarch64-linux = "sha256-PNUUm7xNpPRyQaZm9YDXysJ1yo/IzxUz+kqI6/Z6fpo="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 9cd6b0d9ae0..394ccc3b723 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { itstool wrapGAppsHook desktop-file-utils + gobject-introspection ]; buildInputs = [ @@ -72,7 +73,6 @@ stdenv.mkDerivation rec { brasero grilo - gobject-introspection python3.pkgs.pygobject3 gst_all_1.gstreamer diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index 208d50a2773..bc7a6ea5a1f 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 fdk-aac-encoder - gobject-introspection gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -28,6 +27,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook + gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/soundsource/default.nix b/pkgs/applications/audio/soundsource/default.nix new file mode 100644 index 00000000000..e211a573668 --- /dev/null +++ b/pkgs/applications/audio/soundsource/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "soundsource"; + version = "5.6.0"; + + src = fetchurl { + url = "https://web.archive.org/web/20230707140658/https://rogueamoeba.com/soundsource/download/SoundSource.zip"; + sha256 = "1avm1jr75mjbps0fad3glshrwl42vnhc0f9sak038ny85f3apyi0"; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Sound controller for macOS"; + homepage = "https://rogueamoeba.com/soundsource"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 43724953eea..18e0cfe257f 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config python3Packages.wrapPython + gobject-introspection ]; buildInputs = [ flac - gobject-introspection gtk3 libappindicator libnotify diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 72b1c691c58..1ef5d436ffc 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.11.0"; + version = "19.12.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU="; + sha256 = "sha256-WpzUEn3BuC2OxrsqYete595m6YWv27QXnTfW1F6CX9k="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/taproot-assets/default.nix b/pkgs/applications/blockchains/taproot-assets/default.nix index 80cc3dbfebb..602025e60a8 100644 --- a/pkgs/applications/blockchains/taproot-assets/default.nix +++ b/pkgs/applications/blockchains/taproot-assets/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "taproot-assets"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${version}"; - hash = "sha256-DOtCnPnS5Oq5B4xaYmNCXxMYJ9fhPZ11OfPKXH7eKUg="; + hash = "sha256-nTgIoYajpnlEvyXPcwXbm/jOfG+C83TTZiPmoB2kK24="; }; vendorHash = "sha256-fc++0M7Mnn1nJOkV2gzAVRQCp3vOqsO2OQNlOKaMmB4="; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4f907cf67cc..fc8600abb1a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,7 +17,10 @@ let version = "2022.3.1.16"; # "Android Studio Giraffe (2022.3.1) Beta 5" sha256Hash = "sha256-D+Hoa50fzvtO0/6DsExmGSDzcgDIT2Bg+HvI6mCle14="; }; - latestVersion = betaVersion; + latestVersion = { + version = "2023.1.1.12"; # Android Studio Hedgehog (2023.1.1) Canary 12 + sha256Hash = "sha256-/BKtjX3O6PCqtzVfVMPICcip6tf6W/JV5UzWgON+kZY="; + }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 674b2733080..00bb6dea325 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -24,9 +24,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils - appstream-glib wrapGAppsHook sassc ]; + appstream-glib wrapGAppsHook sassc gobject-introspection ]; - buildInputs = [ glib pythonEnv gobject-introspection gtk3 + buildInputs = [ glib pythonEnv gtk3 gnome.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix index 509eee06e2b..3b73e0843d9 100644 --- a/pkgs/applications/editors/gnome-inform7/default.nix +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -23,10 +23,10 @@ let docbook2x docbook-xsl-nons wrapGAppsHook + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection vala gtk-doc ]; }); @@ -50,10 +50,10 @@ let python3 glib wrapGAppsHook + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection vala gtk-doc gst_all_1.gstreamer diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index b0393cdf845..1b0f0472dd4 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,13 +17,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip" }, "name": "ideavim" }, @@ -32,7 +32,7 @@ "idea-ultimate" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip" }, "name": "python" }, @@ -42,7 +42,7 @@ "idea-ultimate" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip" + "232.8660.185": null }, "name": "kotlin" }, @@ -63,13 +63,13 @@ ], "builds": { "223.8836.1185": null, - "231.9011.35": null, - "231.9225.12": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", "231.9225.18": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip" }, "name": "ini" }, @@ -79,8 +79,8 @@ "phpstorm" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" }, "name": "symfony-support" }, @@ -90,8 +90,8 @@ "phpstorm" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -103,9 +103,9 @@ "rider" ], "builds": { - "231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip" }, "name": "python-community-edition" }, @@ -126,13 +126,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip" }, "name": "rust" }, @@ -153,13 +153,13 @@ ], "builds": { "223.8836.1185": null, - "231.9011.35": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", "231.9225.18": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip" }, "name": "rust-beta" }, @@ -174,10 +174,10 @@ "webstorm" ], "builds": { - "231.9225.12": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip" + "232.8660.143": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip" }, "name": "ide-features-trainer" }, @@ -198,13 +198,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", "231.9225.18": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", + "232.8660.111": null, + "232.8660.143": null, + "232.8660.185": null, + "232.8660.186": null, + "232.8660.197": null }, "name": "nixidea" }, @@ -213,7 +213,7 @@ "idea-ultimate" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip" }, "name": "go" }, @@ -234,13 +234,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", "231.9225.18": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" }, "name": "csv-editor" }, @@ -261,13 +261,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", "231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" }, "name": "vscode-keymap" }, @@ -288,13 +288,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", "231.9225.18": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" }, "name": "eclipse-keymap" }, @@ -315,13 +315,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", "231.9225.18": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" }, "name": "visual-studio-keymap" }, @@ -342,13 +342,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "231.9225.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.23": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "231.9225.23": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.111": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.143": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.186": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -368,14 +368,14 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "231.9225.18": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip" }, "name": "github-copilot" }, @@ -396,13 +396,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "231.9225.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" } @@ -410,29 +410,35 @@ "files": { "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=", "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", + "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=", "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=", "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=", + "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=", "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=", + "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=", "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=", + "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=", - "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip": "sha256-aetarXrmK7EdYqLqAY0QNmi/djxDJnEyNTV1E0pay7Q=", - "https://plugins.jetbrains.com/files/17718/364783/github-copilot-intellij-1.2.15.2816.zip": "sha256-ONmt+9mZN+/SyesZw6JV8S2U2SH5rggvojCXT0whI/E=", + "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=", + "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip": "sha256-qsKmVhgh8FyZN4cWbt/UKQEnk+3ANR2U2+wo5sVZZf8=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip": "sha256-vin0+O9f4rY3FYqztzdIlyal5bvrvrt8Q8neDrXRmsU=", - "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=", + "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=", "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=", + "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip": "sha256-ZJuLy0WM1OC6pjeEyBFDeOqbUz0gcUIgd71k4ggcCeA=", "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=", "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=", + "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", - "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip": "sha256-kCS/fglqb4MD/sE+mGHchvQCUOdZiDrYtTAzn7XITkM=", "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip": "sha256-PasY5Ep9vlbM5SAs/uB4j8b7F6dl8keeV/yLAuoTcZY=", - "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=", + "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip": "sha256-8GSMckx4hHAfJBZbWcTuN85RROLaXTGix3a9QwZ5pSc=", + "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip": "sha256-uHitLtuxa6w7XL0kdGf1hPAah8OpsrUWBLxbUNf7Y9o=", + "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip": "sha256-qa7R+YfVWu/x5p8t28tDtRtMH6dZCGZzMXycpK+epQo=", + "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=", "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=", - "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip": "sha256-VZoavuQyHP7rJ3p/R+maoHetEt8bYP/eSnlfEgfFrFc=" + "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o=" } } diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index e0ddf477be8..1024284a011 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,58 +3,58 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2023.1.5", - "sha256": "69a274098fe35ca53edbed460f1044691cedf595d080e291644a013905591bf3", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.5.tar.gz", - "build_number": "231.9225.21" + "version": "2023.2", + "sha256": "45671bb8cf7b18bd6da2b519b950f28d315ad49d230494a08785e78219e43819", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.tar.gz", + "build_number": "232.8660.186" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.1.2", - "sha256": "57e8a79d69d9f34957fe7fa1307296396ab7c2b84bacffb6d86616cbcd596edd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.tar.gz", - "build_number": "231.9011.35" + "version": "2023.2", + "sha256": "f8344dad4f502a215440fb7ccbc4c69acdd0b18f33d855f0d0d0d2bbe44a5f26", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.tar.gz", + "build_number": "232.8660.111" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "07158e00ef81c58c9b295c1777635069777f5f3f16d593b14429673b9699cfff", - "url": "https://download.jetbrains.com/python/dataspell-2023.1.4.tar.gz", - "build_number": "231.9225.14" + "version": "2023.2", + "sha256": "f8c486cb2e7cc2ce78fff173785f75c8c7461da622f81d3abe7017434e2bb4e4", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.tar.gz", + "build_number": "232.8660.202" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.1.3", - "sha256": "32d97c9935e4825d5f395e5039033121649838a3811e25301d70f32315a2e106", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.tar.gz", - "build_number": "231.9161.32" + "version": "2023.2", + "sha256": "8b4064670f42d1812cf44068dd989d518b46fd04a8bd4b6b5e8f84e9a44f58b2", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.tar.gz", + "build_number": "232.8660.185" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "ac8bd42b6dee2aedcfd05656b7f74969e6775f41c9d6614d3cc4946fbc8c346f", - "url": "https://download.jetbrains.com/go/goland-2023.1.4.tar.gz", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "17f1bbd9a46061fdd013d49a99859c1ca3ece1a3cc51cdcf2b46eae0432f2481", + "url": "https://download.jetbrains.com/go/goland-2023.2.tar.gz", + "build_number": "232.8660.185" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "9ea98c03b29903f7bde41f6a3c039621fff5d04015f37f9f21e04966d557ea90", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.tar.gz", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "b1a5c267ca86850764b0541bee0c27af7d2082e55516e95a0c8d30539571735c", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.tar.gz", + "build_number": "232.8660.185" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "b5b15e1bbc7d953715a2b3f5eb25b9bb26baa99bdbee2d11acc91339c725f73a", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.tar.gz", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "d398599557cc732fd1f58f38104d7cda35e326e4cd394245a8358e02fb8878b3", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.tar.gz", + "build_number": "232.8660.185" }, "mps": { "update-channel": "MPS RELEASE", @@ -76,18 +76,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "4def30bc442113605b907586ee087bc72e75fc63d826b9a9e16cd97dbb467309", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.tar.gz", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "64472ee39d244fbc2cc8aeade204d02a767c7ce66b2edaa26a8499eeef44f3d7", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.tar.gz", + "build_number": "232.8660.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "0f9beda16f7e90631e75954bf780669ab05621b69e9f91a9e41ed1ecd1ac26cf", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.tar.gz", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "95f1666c471a9d752c53ec0b776840552e023f6405a3b000ce6f1014125bfc83", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.tar.gz", + "build_number": "232.8660.197" }, "rider": { "update-channel": "Rider RELEASE", @@ -100,76 +100,76 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "b9b5d2a3c0c0517e1ef1363b2abe5ca41441343bc1c8999d1b8e6dff248027fb", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.tar.gz", - "build_number": "231.9225.12" + "version": "2023.2", + "sha256": "9da529bbc2c65503f1e01c85b745f676140c2263b9541fb1c5bae0d3b9329787", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.tar.gz", + "build_number": "232.8660.186" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "d522583e234aaf66d3da760908d2fa1254990a2497bb7c6eb84ee9d0bb3c5ffe", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.4.tar.gz", - "build_number": "231.9225.18" + "version": "2023.2", + "sha256": "cc97c8ba44560dea41de1c03fd6023a287c3dca6476c297f02a473af124c073f", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.tar.gz", + "build_number": "232.8660.143" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2023.1.5", - "sha256": "d372abe2e1598e9ae3ca121a85d7d89211e65d99b4ca2183ef05dd3172212c44", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.5.dmg", - "build_number": "231.9225.21" + "version": "2023.2", + "sha256": "2f97bc578e0eb21f4cde2291dc78f19dac5839d84319ba780cc8c98fd9694108", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.dmg", + "build_number": "232.8660.186" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.1.2", - "sha256": "13302c2cda09fdf08025430cfb195d7cbf34ad0f66968091e5227a8ff71a7f79", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.dmg", - "build_number": "231.9011.35" + "version": "2023.2", + "sha256": "0457a7503d4a1f0824777f5e27416831070b109be93c9c7bc465065c76631009", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.dmg", + "build_number": "232.8660.111" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.1.4", - "sha256": "c0c79501d88fc003707707b3410ab4378aaef44a9cebb220f5b1eaeb3db640e9", - "url": "https://download.jetbrains.com/python/dataspell-2023.1.4.dmg", - "build_number": "231.9225.14" + "version": "2023.2", + "sha256": "3f46033d82f23d558c9b1d0eb0d05a3bd1bcc6c320412e0dbadecdb326e9492a", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.dmg", + "build_number": "232.8660.202" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.1.3", - "sha256": "18d9bcce099d9f78ff4990f93c9ffc6819d7e789f4372659a3ea3bf0f1a2f85a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.dmg", - "build_number": "231.9161.32" + "version": "2023.2", + "sha256": "b5b3cbc4f339ff9ae255196fb32b1db86964ea8ce48dfe61c3d5976a5d831359", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.dmg", + "build_number": "232.8660.185" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.1.4", - "sha256": "ec4d8724ef0b3c1d597801d23622ea5625b65c260d43d9e670c2fc63f448ea45", - "url": "https://download.jetbrains.com/go/goland-2023.1.4.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "8dfde9eb0344c0c049c2c327ee5c92dff612bf2ac2574a04987b7f99ed91b47e", + "url": "https://download.jetbrains.com/go/goland-2023.2.dmg", + "build_number": "232.8660.185" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.1.4", - "sha256": "07dcc09078efea0a6c7d009ec79878d69534f2ca973f546ed469abbc4fec5088", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "ad46a72491b50a5bf5f4a3066e7fb969576dd5b4f4dc322b31f14f638d564e2e", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.dmg", + "build_number": "232.8660.185" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.1.4", - "sha256": "d039c8789724962fa264d55d47ac2e5efc2779fd082dcb6615ae15b2ca66ce91", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "5c60bbd9527b049777bf3ddd1de0f515688fff9e08d1eb09029082677f579151", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.dmg", + "build_number": "232.8660.185" }, "mps": { "update-channel": "MPS RELEASE", @@ -191,18 +191,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.1.4", - "sha256": "8474b4efea07381d4847b183c26a1d7f4bb80807d34ad5cd058e643b7f930d28", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "2de31d04ad6f199bac193975b6cba6904b8f074c9bc14ac7f14a0eaa6089324e", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.dmg", + "build_number": "232.8660.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.1.4", - "sha256": "04945795cdee1fb36a5c19c2846203bcc4bccba8939f58dd1265651578f9c4c6", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "5db02ef2b9086e2bbbc5ba94b9729b8ae5e328364a7c000d1cf3f4e85b92f404", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.dmg", + "build_number": "232.8660.197" }, "rider": { "update-channel": "Rider RELEASE", @@ -215,76 +215,76 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.1.4", - "sha256": "4ade59a9d04cc4b5e0a4ed62c2c60e8ddba9717ae91a3e8cf53363d8f0a41e29", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.dmg", - "build_number": "231.9225.12" + "version": "2023.2", + "sha256": "fc169ca55848e01ab6432babc358d93bf4e1dcc6f343e79fe27144912bed854c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.dmg", + "build_number": "232.8660.186" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.1.4", - "sha256": "9e80e3047396b99f82d541813a1177e058f3acb0fc81d27a625e3f62cc1ddadb", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.4.dmg", - "build_number": "231.9225.18" + "version": "2023.2", + "sha256": "daf4d9c0b27f305e063d128ed7a8a63cbfbe8ddfaadb4cb0b1484b9742235137", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.dmg", + "build_number": "232.8660.143" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2023.1.5", - "sha256": "432955fc7926a5387c1fa9b30433b0e68f49ab88ea40d0bddef711692b28e8b1", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.5-aarch64.dmg", - "build_number": "231.9225.21" + "version": "2023.2", + "sha256": "c2b5ea78b6859f1ef56f32e040e0f9d3d9793198cfa2a8f73d21df2731ddedfd", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2-aarch64.dmg", + "build_number": "232.8660.186" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.1.2", - "sha256": "3af05578dd8c3b01a5b75e34b0944bccd307ce698e80fe238044762785920c90", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2-aarch64.dmg", - "build_number": "231.9011.35" + "version": "2023.2", + "sha256": "51a9ba6f4448ffc10474522df6b5264972286599ee8165f9b961cd99c1c08bdd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2-aarch64.dmg", + "build_number": "232.8660.111" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "bd0166ea6dcc4de0115102af44da7a587f4bb00a60f9ff09b3da35f2b38370c3", - "url": "https://download.jetbrains.com/python/dataspell-2023.1.4-aarch64.dmg", - "build_number": "231.9225.14" + "version": "2023.2", + "sha256": "52e4e31b2dbc2ed29c547a01c025983b2c8af8b1d58ac8325694256e96fd2a21", + "url": "https://download.jetbrains.com/python/dataspell-2023.2-aarch64.dmg", + "build_number": "232.8660.202" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.1.3", - "sha256": "3564f680ff11ac66722e970491d37d3f1faeb09354095f2086bf0bf4a0897e5b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3-aarch64.dmg", - "build_number": "231.9161.32" + "version": "2023.2", + "sha256": "09b7e8a217ac69accf286dbbc46397b3a18e51775d1682c2eb2db255ed69d2dc", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "5b60eac7a22f6e37345efe9dbbd65e9176a6f1ec899f92bcecbcabb8f96b2ae4", - "url": "https://download.jetbrains.com/go/goland-2023.1.4-aarch64.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "0b48b7b62972ff6ff81c3e16adfe3824043c989d693bbd2a5b03145a80c4f72e", + "url": "https://download.jetbrains.com/go/goland-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "806d6edf7e4cf5636938522c4f64887ed9657b7628311573148d630bbd677228", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4-aarch64.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "e7c52c2cf202841e729868f3cb73bf40b92cb3c3860e60d614a7daa63dd5ee25", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "a03b9357a0d54936df1631f75d11d2647bc89ca5c5baaa4af07a58ab729924cc", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4-aarch64.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "f6255dc42b1631a19fc02ec8879f70963c38273d7998a709b745cffcaf9c12c8", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "mps": { "update-channel": "MPS RELEASE", @@ -306,18 +306,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "34bd9ea7434e73d4552a90b2b15ae93b7f4ee8df23690d7b74862d50d85207bf", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4-aarch64.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "6c841fbe53bd4cfd97867757e02db496ac5a3f749f9c18b5afa20577ab62bab0", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2-aarch64.dmg", + "build_number": "232.8660.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "7c86ed350d71b2fef5f1992a377e7fe161c38a3de91bc1f3bad0d9aafbcde6a8", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4-aarch64.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "8c022d282d409079abaf7b611a61041f6022140804587d10d49a150457e35e83", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2-aarch64.dmg", + "build_number": "232.8660.197" }, "rider": { "update-channel": "Rider RELEASE", @@ -330,18 +330,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "ddcb8bf654c24daa0365b9e734b9c6b6d0238303d0f8f540d6e1ce821539e59e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4-aarch64.dmg", - "build_number": "231.9225.12" + "version": "2023.2", + "sha256": "b91405e6c187baea2ac2f1ee81b7fdf6c4e60f52629bf3afe5bbb679baa76af7", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2-aarch64.dmg", + "build_number": "232.8660.186" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "15d1a6a65c6cb073479f82394d2691fd84c54bc7eb2c5f55a6db77bdb6e500bd", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.4-aarch64.dmg", - "build_number": "231.9225.18" + "version": "2023.2", + "sha256": "aa98f5c6ae61f3571cdc4abbd277c770d0b4a790e7fe4d60e1095b192a00b5b0", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2-aarch64.dmg", + "build_number": "232.8660.143" } } } diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index cb814ddbc95..a9770a5c1be 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -42,7 +42,7 @@ rec { dontInstall = true; buildPhase = '' - convert ./libgui/src/icons/logo.png -resize ${size}x${size} $out + convert ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out ''; }; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix index c37a9e3bc73..7223d9e69a8 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # There appears to be a similar problem with metakernel's tests doCheck = false; - meta = with lib; { + meta = { description = "A Jupyter kernel for Octave."; homepage = "https://github.com/Calysto/octave_kernel"; - license = licenses.bsd3; - maintainers = with maintainers; [ thomasjm ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 7dfbebb95df..15b9d0ba80b 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -4,6 +4,7 @@ , libvterm-neovim , tree-sitter , fetchurl +, buildPackages , treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; } , CoreServices , glibcLocales ? null, procps ? null @@ -15,22 +16,32 @@ }: let - neovimLuaEnv = lua.withPackages(ps: - (with ps; [ lpeg luabitop mpack ] - ++ lib.optionals doCheck [ - nvim-client luv coxpcall busted luafilesystem penlight inspect - ] - )); + requiredLuaPkgs = ps: (with ps; [ + lpeg + luabitop + mpack + ] ++ lib.optionals doCheck [ + nvim-client + luv + coxpcall + busted + luafilesystem + penlight + inspect + ] + ); + neovimLuaEnv = lua.withPackages requiredLuaPkgs; + neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs; codegenLua = - if lua.pkgs.isLuaJIT + if lua.luaOnBuild.pkgs.isLuaJIT then let deterministicLuajit = - lua.override { + lua.luaOnBuild.override { deterministicStringIds = true; self = deterministicLuajit; }; in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) - else lua; + else lua.luaOnBuild; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); in @@ -99,6 +110,11 @@ in # nvim --version output retains compilation flags and references to build tools postPatch = '' substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + sed -i runtime/CMakeLists.txt \ + -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" + sed -i src/nvim/po/CMakeLists.txt \ + -e "s|\$<TARGET_FILE:nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" ''; # check that the above patching actually works disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; @@ -117,6 +133,7 @@ in cmakeFlagsArray+=( "-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -" "-DLUA_GEN_PRG=${codegenLua}/bin/luajit" + "-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit" ) '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 65517d43bbf..42209ad09e0 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "16"; + version = "18"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-k+Zj6TKW0tOSYvM6V1okF4Qz62gZMETC6XG98W23Vtz3+vdiaddd8BC2DBg7p9Z1CofRq8sbwtpeTJM3FaXv0g=="; + hash = "sha256-CTWOW1vd200oZZYqDRT4wqr4v5I3AAgEcqA/qi9Ief8="; }; buildCommand = '' diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 05f8c9a2ce5..d02aaf2dd03 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.62.6"; + version = "2.62.7"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-wSefvbpqxEbzgReOBPcot+VeXazwK/NPzh+wmmYhrls="; + hash = "sha256-NQBFplrYh33zcKfXrcZpWrF3Uac7YXdxh3D+wixEzP0="; }; vendorHash = null; diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 85e361f4813..ab59232d859 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.166.9", + "version": "3.167.2", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-amd64.deb", - "hash": "sha512-D85W50K3jRBKhrPz3Wa9aClnHFMRPQ0YgP71uypfcCcuKVnKd3Ol1sFzsyMzl2uhB0aGOkpd2OB+OHceVFqmag==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb", + "hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-arm64.deb", - "hash": "sha512-pbBLqIaDjQoVGCOfpOxwjWRSMoQsefsYOHTRNTNlDDNO7DRUa/WeSbOYOgLJM5yGIBVXQoRmO7ycWfAWVAPIDQ==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb", + "hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw==" } } } diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix new file mode 100644 index 00000000000..fbed493f2f8 --- /dev/null +++ b/pkgs/applications/editors/tijolo/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, crystal +, vte +, libgit2 +, editorconfig-core-c +, gtksourceview4 +, wrapGAppsHook +, desktopToDarwinBundle +}: +crystal.buildCrystalPackage rec { + pname = "tijolo"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "hugopl"; + repo = "tijolo"; + rev = "v${version}"; + hash = "sha256-15not/B+O+wIZ/fvLFy26/dyvq0E+bZUeoSZ6HxMMKg="; + }; + + nativeBuildInputs = [ wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ]; + + buildTargets = [ "all" ]; + doCheck = false; + + shardsFile = ./tijolo-shards.nix; + + installTargets = [ "install" "install-fonts"]; + doInstallCheck = false; + + meta = with lib; { + description = "Lightweight, keyboard-oriented IDE for the masses"; + homepage = "https://github.com/hugopl/tijolo"; + license = licenses.mit; + mainProgram = "tijolo"; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/pkgs/applications/editors/tijolo/tijolo-shards.nix b/pkgs/applications/editors/tijolo/tijolo-shards.nix new file mode 100644 index 00000000000..480251e7775 --- /dev/null +++ b/pkgs/applications/editors/tijolo/tijolo-shards.nix @@ -0,0 +1,27 @@ +{ + compiled_license = { + url = "https://github.com/elorest/compiled_license.git"; + rev = "v1.2.2"; + sha256 = "1f412r6m31cc093lcw31m2rp5s3y7vh6q3wc3xh9b8vccvmj21p7"; + }; + fzy = { + url = "https://github.com/hugopl/fzy.git"; + rev = "v0.5.5"; + sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv"; + }; + gobject = { + url = "https://github.com/jhass/crystal-gobject.git"; + rev = "v0.10.0"; + sha256 = "02cc3486ifbffdbvgl75ylwn47gpfb2j0srz92jx5yz1d596x746"; + }; + toml = { + url = "https://github.com/crystal-community/toml.cr.git"; + rev = "v0.7.0"; + sha256 = "0vznx2irvx6m8w6chdf9ms72n2w0cf2m5cwh0cjmp1jz9y3xwv7z"; + }; + version_from_shard = { + url = "https://github.com/hugopl/version_from_shard.git"; + rev = "v1.2.5"; + sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 595c6a135cc..ef7f26c0d27 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2023-05-20"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ec80f3d48dcbf19209ef51d6020838cda5a1d46e"; - sha256 = "0ahhs6ffdffap566k6p0f1yncziacwnygq3ndaarngqz29w6wl62"; + rev = "6134040ebedb7ab731e9b9d4b272c2ab55fb3af7"; + sha256 = "1dppzp2v99p94qw23ad35w53lnfs8yk6cpp29ywq78rmgdkjv77c"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-07-21"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "a184fc1c732e16b10ed0bb19f8e9789b2b20b71a"; - sha256 = "0xhyf03ac0g30plsy7aridx30b3xx9c2afshjlzh0r22czi1wza2"; + rev = "aa1cccf230a01bd85d5173f7d87f782fd83caa88"; + sha256 = "1kx8n6rn9vgsp7j9kmdz2f6yg812i64nclii0y2cjpnb8h1aa0cf"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-07-21"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "55778f0ba8d909dbe5a04e1f2f44ce6558b29a5c"; - sha256 = "10fyp5r5521y8fyk8dala572da881m7cakwgnnz1mvi1f70ayy19"; + rev = "8d51a3512fa318393df2bc092e458fd7d6c8e75b"; + sha256 = "0abffydl0h8nnxq5m0vicbi4cxcbfa34m13al7xx0plbk31q3iyd"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-07-18"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "43b2ef9a1b716752dcdcb9fafddfdb871a59051f"; - sha256 = "1byk3i0m779xcrc8fhvdma8x034nxvi1c9hkb8nqgi7d3439576x"; + rev = "f33af3051c79f084824753f9852ed4db95b43c8d"; + sha256 = "00jqh51jmc3xbfpsanhkln1bmrbr65ipbcnaicsac97751xclymr"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-06-27"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "29e5ffe35a2fa1ca5ba19eebfe7cdd0191c16e39"; - sha256 = "109asfm9g7cbcbac55syf19vgn2ifwbxgyy69v51xwyyxlgq2czl"; + rev = "b216892f0c1ce7bbe9efeeb6cf55b52a473f49c2"; + sha256 = "0df56hrqyv1vq19alnpv981fmrb68gx3127izp7pi974r4if87pa"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -967,12 +967,12 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "2023-05-06"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "bad87b034430b0241d03868c3802c2f1a4e0b4be"; - sha256 = "1nplnd4f5wzwkbbfw9nnpm3jdy0il4wbqh5gdnbh9xmldb3lf376"; + rev = "cb012feef7ce8c0bb8cdcb2b858393aa92834f46"; + sha256 = "1zg0pw2jhx8w21yfky3icai0wq87884ybls34hhn9rwkzn78m4n9"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1147,12 +1147,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-07-18"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "d24378edc14a675c820a303b4512af3bbc5761e9"; - sha256 = "0y2il1lpyb9dm8i5mz6gzlis1qf74bp81ks95k016lly6585f4nh"; + rev = "99f0932365b34e22549ff58e1bea388465d15e99"; + sha256 = "17cs0kbgavjsnwjp7n3xbznba0zfpz5g6wgxa6d30070w9hjq91j"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1231,12 +1231,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2023-07-19"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "97090700510b791ae0937b46a78a8c2626c5aba2"; - sha256 = "1jfmf317lpmrm8mnl6874vn6l48466v3q7id9j9aw1w1wdm8zhkw"; + rev = "3664cb28461a30f8b1627180a19b8b22a10331ab"; + sha256 = "13941i4860gkj0vri7zxs7wj2lf9q04scn3v0c57lcbn9ca1kk70"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1303,12 +1303,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-05-23"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "6d0bf36870d15c0c2284f4b6693a66552a6bf127"; - sha256 = "1rr3pyqg7hscs7chjy9mkb98g9vlc17zmfr6lx35vjbd3v7iblwv"; + rev = "b3b0eb798ecbdd16832fd38d4b07ba31ab4fe831"; + sha256 = "127sb5w8sv5ldx6vgzf7ynkw24wpvpdp7m192fh1qgymlnma8hsy"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -2011,12 +2011,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-07-18"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "fc31e6362f5a446919527b654869c4bc08a9e22b"; - sha256 = "1fms3snn2pdgglv7nbvbhh8b4a0kpv53xj6iyjc9f61vmxz29ma4"; + rev = "9bf87e33fdb85d9f423f49450079561557ea6f3d"; + sha256 = "0kighzhclzx7gd2kqzsy28483spr36pnl3m4p7b4cdrkgn9g99rh"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2263,12 +2263,12 @@ final: prev: context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype.vim"; - version = "2023-05-16"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "512db78eb08f284a71bdd83b3ff27026334a3ab2"; - sha256 = "1ab12rir32yhl42ih2zfp7w8f3spi765622xj87aha4jxir20i2f"; + rev = "7ff5b43fc8d5b274aa19ade5af11e9fa57577ed6"; + sha256 = "01pa0aaxyfpq86ff2v38z4fh2ppbglp5h76r9js4vrby0b4yjhks"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -2311,24 +2311,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-07-19"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "f47ef45647d237598b3ceead98a15a358bbf2e33"; - sha256 = "0jk5ny867jf1y3qw2nw0i9035p8q7jqw6xaqzv27cpa6bs5h5pma"; + rev = "39bdecdcb3df41ba7f93c2b5acd4c6e25d80ba07"; + sha256 = "0axs9fk6i81zp748zb9ldvg914w94j38kk04adma6b75py5r9max"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-07-16"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "0fb2082030fb9e922a1aa4951a98aa16ecbb81c0"; - sha256 = "080dhva21q6g8iz2xrpswrp5lbwvyg39kh8sfbz1yb9s0b884byw"; + rev = "dedb7387a50a797a7bd871d009cf711fbf00eb20"; + sha256 = "1p2xyrfp9gdasrh0chr5mf8n7l0z2qhg908578pkl4bjn1sl1q46"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2347,12 +2347,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-07-19"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "ac991666d3c6fef33bf07374d2f1e3d086e60530"; - sha256 = "12ncwari1pmr1psnx106aqmr3lsh67mijfc42jvvgclh3af2bfj4"; + rev = "a8ff103b50a9a4ba3dec9a485699b3382b59ab92"; + sha256 = "1ia2ibqvmv89ijn8xkdrh7n1j4mg6majami4cj1smvrn1jscbjg5"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -3021,12 +3021,12 @@ final: prev: edgy-nvim = buildVimPluginFrom2Nix { pname = "edgy.nvim"; - version = "2023-07-01"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "0d3b64f9159442cf9edcad451a0dd9fb7e31bc41"; - sha256 = "1w43qilfhacnmqr76lp2fkbawbndas180f5ab7h133rwgr64lc7p"; + rev = "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4"; + sha256 = "0s0h8s2wwg2niacp401j7l3c0knl44awf32clq15h1hcabqvvkn3"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3312,24 +3312,24 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-07-21"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "7ddeb57f60e2f19ee836aef5dc6cc1d91771f012"; - sha256 = "1w6mklmzqyzyl314lc3y782vr4kl2dyx6bk4f71x222kxv49hfkj"; + rev = "967117690bd677cb7b6a87f0bc0077d2c0be3a27"; + sha256 = "1rl7lgiwkrjay2zsf97xbp964iqxvqrqc31az6n59pw720rsqn6m"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-07-19"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "c6f3950d1b0e40fb267366c356d99ed5ab10a15a"; - sha256 = "1n8mviqg2xlafmfglhxhvr7mvfqm9kzrzp64wi0g5l69khs4sfdc"; + rev = "97228f78dfee042c18ecce0d788c91f59e770f31"; + sha256 = "0baab64zqj7z5rxb7cmy3k8xwbad1jmqzfljla2z9h3q83xff4a6"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3396,12 +3396,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-07-06"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "7850a771c4e773dc49d63081f508d004b416c13e"; - sha256 = "0vjnhsy0bm4xz9rpxda5n2yiy37yl8h90sh15lw04yc5rwcz88wi"; + rev = "561d85b16d8ca2938820a9c26b2fe74096d89c81"; + sha256 = "0n13m2vdqh75kr0rjlz5m29hcr9jyqxw78isn0gd7vclla1kkjw7"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3432,12 +3432,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-07-18"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ea84a710262cb2c286d439070bad37d36fd3db25"; - sha256 = "0w9x4q7mf1p3g2mk16zhsnznlqk4rd2cc4gwwvafc1hgcqvv5ycc"; + rev = "bc38057e513458cb2486b6cd82d365fa294ee398"; + sha256 = "1l2czwjsskcywjvayx1wcg5538fs2pfp88shx14c9s5q4h0v247m"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3708,12 +3708,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-07-18"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "adcf2c7f2f495f5df148683764bf7cba6a70f34c"; - sha256 = "1lhcysi2v51l5hbv7x74wah0hsndfd6c8slg8q4avbyb46wycppr"; + rev = "11b80e7eea249affc8776483272bcfc627b5552a"; + sha256 = "0mwmyci65w4rzrvlcws7s6yw4m801vdcqr585harccifyrvpslls"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3732,12 +3732,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-06-12"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1"; - sha256 = "14xnn7yj3949kj0q7a5dr18snjrhdpwlw6ka47j5xlq3wv28sfma"; + rev = "3d67c10c422b2d2800761f4f484305540d54450b"; + sha256 = "186zb2zh4njwy2rxfhmgq0bb3nyfiwf7d289k35qnzw0i7b21wkj"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3768,12 +3768,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-07-07"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "6550ddf5ce491d17af009c397aceb25310566eaa"; - sha256 = "01im6m0h7pa04dzh0daxkll5y1i7zf5kxlj01cribghl04zlhdxc"; + rev = "816fbe43b5dc15edcafa0b32785a4972fb34e67f"; + sha256 = "0fs3rf3l0dp0141rc0g75alq89z9khjcvhfz7brn291bik7xm56b"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3971,12 +3971,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-07-17"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "9bc54093737c100c78c6c51ec0478b14e2d8f2fd"; - sha256 = "0nl9rx0ps00a7c669nh11s7qmn02w1l4y9a0g9sqhz4k8zk65dyj"; + rev = "070f78dcf9fdb069ccb57e1b15bdfd7596a08bbd"; + sha256 = "1j0dg6xsksndzfksszpwrs6a9ldkzfm2v1blk1r5yzj5lyr6q9j5"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4019,12 +4019,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-07-05"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "76136ccd93ed608e8109762f032cf1118981ebbd"; - sha256 = "09mqjrbzhfbfs6n1hg4dv5kfr1xbwbq5qhd8b52550bs6a43r9bg"; + rev = "1840fe27dbb38efa13c8af4614acafe6efa41988"; + sha256 = "1h4h4hkz9vkdh2hza1qp0xmiv1rkxzzq7aa4zrp82460z1ic3z1h"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4136,6 +4136,18 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; + hover-nvim = buildVimPluginFrom2Nix { + pname = "hover.nvim"; + version = "2023-07-10"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "hover.nvim"; + rev = "c366d1b0f9d6612d25681d3fea0f9ea46fa54f4d"; + sha256 = "0vhr5a9nsww4xhniv86j05isfv94fwa5sz2ikkn6fnl7d743m1xr"; + }; + meta.homepage = "https://github.com/lewis6991/hover.nvim/"; + }; + html5-vim = buildVimPluginFrom2Nix { pname = "html5.vim"; version = "2020-08-22"; @@ -4607,24 +4619,24 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-07-21"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "ed15f6b39422f46412212005f6d12c6f353b0293"; - sha256 = "0vq8cjv21462ndgg39x7na2xgigm5j3b73jlh4x8wnrnsrnhw9ap"; + rev = "3ad55ae678876516156cca2f361c51f7952a924b"; + sha256 = "1yzdy9iqfx2aa7gd56lxqjmarpflnqqv0yyx9vcz5w9i7bg7dk1g"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2023-07-15"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "146c6294bf0b4db1572fa7232039aaa9003a52b9"; - sha256 = "0pbp4b4g57xpk9r3mxisgm2frr80wh25f8izwg1k5fg3izvar60g"; + rev = "1578fa3db0a707393d690a2357e7de6a47081ce0"; + sha256 = "09kvwi51davqyvi0zhbkw5ri82z3g2ss4v66q6hs9n2ypm03hlvh"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -4667,12 +4679,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-07-17"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "7eeeb3ff74ff8cabd583a061492e76c1c6d2bac8"; - sha256 = "0dqplrxdx4j62r7xsjr1dfgws92sx4dbqiw95ry1c0iv8923vbv4"; + rev = "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c"; + sha256 = "093fzf1bki2ll3lrqbnrw9w7i7aajbma4zq83c2nkxwi5gj5jqgl"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -5050,12 +5062,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-06-01"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "17ff7a405fea8376b015b8ea7910d2e59958bf68"; - sha256 = "1qgl3j9a0b3wf381q859xjw0pcfbfxxm0fsdhj7bgfdq11v2q60p"; + rev = "58d4e810801da74c29313da86075d6aea537501f"; + sha256 = "14v8mkv3q7l0pv63i3sgiv81bg5yfq927n94nrfz7nwfmg82rxxa"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5231,12 +5243,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-07-14"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "828a538ac8419f586c010996aefa5df6eb7c250b"; - sha256 = "0pl2s2im38pcvkj8qklmkcihli4634hf77zykhkbx18ip84v3j2a"; + rev = "e86a4c84ff35240639643ffed56ee1c4d55f538e"; + sha256 = "00pv0yry8cj8w7y20r7ccla4482lh3dp9pd00k3lcycnbzj7k0s1"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5255,12 +5267,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-07-04"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "5ad3e113b0c3fde3caba8630599373046f6197e8"; - sha256 = "1mqbby4arzr136szh371p2ynwvpaf6glkzyb7s5sr547v7qmb29c"; + rev = "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f"; + sha256 = "1yvf5hml1nhglmfaa0da5mjmgxaysc8x8k1rk820vpj5f1bhl70p"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5339,24 +5351,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-07-18"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "78cf17f23dd5372154e1cc90dc3ae27da6368742"; - sha256 = "11rm5nyr9qr6d5nwbjg05018lzs8im15vb86gyivsn0rzkgfywfj"; + rev = "aac602e097b99a06bc84e43356f080eb6256dd21"; + sha256 = "0waznhg7qbs50wqkfs0pk5ar92drlf35fgg7lclcjdq09gji64v0"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2023-04-18"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "726746ed02eab2eef137a7ecceda7214fbeeec41"; - sha256 = "1p8bpa7g349zhx7z78gyxrhfrhibihd9v7p4224qzddk0pd4ibkz"; + rev = "74573b63b9ef0583262b6bf6ef209eb7f3b06b94"; + sha256 = "040z12dxagbfsbkdwpsz6dk2vpak3z737ra5ipb1ljqsswgrj5f9"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5735,12 +5747,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-07-18"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "62515f64dfb196e8abe1263e17e2546559e41292"; - sha256 = "1i9s3qvksabqbhllkl5l41fsj1vd0baqcnsbv31vz1mb6k8wrz8p"; + rev = "866b6b6e687a93ba98851a03a74bf6d9211b7299"; + sha256 = "1a99622n34h855fw3ayib40zv7v3w05qldwa44gy69zfbvgw8z4s"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5771,12 +5783,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-07-21"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "94b5d98a3381594e91c445842192f1d2f1375b96"; - sha256 = "1b5glxg63h32bwlf8p5p8qdadpxn308phypwgcrsi8h0isivz6j4"; + rev = "e94b15969e65eafbf31749700828cac117cc1336"; + sha256 = "1anzm10mc94lwnhlcxp4qkxnvf1kwr1bxb4kjq1a2c6v05sx5jfb"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -5831,12 +5843,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-07-18"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "774f5dd80d15aa11d0221aba767da699f9533e32"; - sha256 = "1q46i761h57hpcvaw37zdw5maia6mj3i81l1kfwa0b061drsr0yh"; + rev = "e76f0cb6b3ae5e990052343ebb73a5c8d8cac783"; + sha256 = "194bawzni3psgzs2aljzdm7rgxv58psm30aakrnqy6rl11sackrc"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5879,12 +5891,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2022-11-01"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "b7c241fb5737c50bf09cf1e26298492c3fc0457a"; - sha256 = "11gbxkmbiiklqa8gzjm7dhg3xsv9k2wl131q6g18nwyrc5gaw8vb"; + rev = "efb2a615df2e6df9364087686dacca223fcfa16a"; + sha256 = "1yihgplpdgkn7dgsgwrw8q3pl0f7hj06wkpv5j5y834n5zrzm4n0"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -5903,12 +5915,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-07-15"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "fb0b31ae1dcdc7d68af5c66db4434ae5ebeffcfc"; - sha256 = "0qgfhfmsbvh93bl621syfx7c275if2zx22vrm3pm77lk83z8q039"; + rev = "bec7be0f13ee19c85561943fc5f7b8daa4f4d465"; + sha256 = "04w1ifxrxsyzyw0l4kv2sqnxjzv46j5v39l4d354042q5xcriw9c"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5975,12 +5987,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-07-17"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "41e22bafacd20d0a0afbbd045c7f9763c7b8b57a"; - sha256 = "1dijxhpklz3yjkispdld1qf9jcfsr46f1j0lw4vgg9k20f5sb0sm"; + rev = "d936279cee9ba3547adc8aacb62accd900edc8d1"; + sha256 = "1mqmdmk22k4m176bp7hlkx594fjhplrq3mqgbzim9kxnaqp4m5wx"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6263,12 +6275,12 @@ final: prev: nix-develop-nvim = buildVimPluginFrom2Nix { pname = "nix-develop.nvim"; - version = "2023-06-14"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "figsoda"; repo = "nix-develop.nvim"; - rev = "2453645ea621fd7265022628a44010fef9a64cea"; - sha256 = "1nxzxdahv1zr0kbnhf5sgw7657dha9m01xi2ij8fm8hp3ydvbypn"; + rev = "afea026f5c478c000a8af8de87f7b711676387ab"; + sha256 = "0nwjgr19pzdxd7yygz380b388qcfbzp9svs916kh0zayzi9yxc2k"; }; meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; @@ -6323,12 +6335,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-07-20"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "679740982682018a0805a5c813b19e4c7540f7a9"; - sha256 = "1wk475y5pakffriz09kldj1p4kg05ryrkxzcj03c1slj8c7widgr"; + rev = "894db25ec726d32047799d4d0a982b701bec453b"; + sha256 = "1vpdl0905vxxbcc354v4g2m2nrpc7fmzpn2yjwgmwz34wacvmik5"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6419,12 +6431,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-07-08"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "720d71b546b8300bf3951c839f52db6cb83c3dc5"; - sha256 = "0byhs3711k9ji1vwvc2zgv75jvj7njfcmg47ipw28hl3nmhv3h67"; + rev = "f18488d41cb74321377631f691a3247bc59cb064"; + sha256 = "1sz57jxzv64g1669pj5xa1kp64bbkr8gksq0wkrrmp5cjdky31bm"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6479,12 +6491,12 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-05-13"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "4f3aa29f49b38edb6db1c52cea57e64ce3de2373"; - sha256 = "0cl2f2xvl3sd0b0f6pmji9czcwyrgh0km9qji6pip6yhna4g7c0f"; + rev = "6247ca9aa9f34644dfa290a6df3f6feefb73eb97"; + sha256 = "0bfkhc046wwgrf02snvbx1p43xqhkhcr9b4r8w2nws4hlbzkdd4f"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -6563,12 +6575,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-07-17"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "d6d3e758698a00478ce5bbecb1c9e223478c4e91"; - sha256 = "0aixbg4c5ihdk8s4cch2fyilfjzgbi9x28byrz1k7q1ah8hj1wak"; + rev = "056da2596e20959d0fd6d9f713c10c6884e5ece0"; + sha256 = "0fvyss1xn1w9vrrsx6vxpcawh3zpw03qd4iibgswqpgbkdxzxa9w"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6731,12 +6743,12 @@ final: prev: nvim-fzf = buildVimPluginFrom2Nix { pname = "nvim-fzf"; - version = "2022-07-12"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "a8dc4bae4c1e1552e0233df796e512ab9ca65e44"; - sha256 = "0cyq5rq029hnk9p3qw6gfhxvqiz5m788i4w6n4xxb6wif642bd4l"; + rev = "45d14cd66c160b199b3c5cef0e7c81793dc2b1e0"; + sha256 = "1qv7k1nvh61sd24k0c1iayhv3xw9vx14ciqgdmfggl8d4cfvlg21"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -6755,12 +6767,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2023-07-16"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "cb3166d1eca0118f25c3fb98361e3eadaea66dcd"; - sha256 = "18cdfai44a8wsvnj9nsan55p5p0lnabip5bvqidainagcs4rlq9n"; + rev = "7c92e203224ef3e24a2d07546bd56b4520cd9633"; + sha256 = "034c35a4dg3pr5ffhpw87gq6b7bdvhqqlcn9rwgjhslnsqx0h8cq"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -6791,12 +6803,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-07-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "9e55fb7d6773fdeecddd87d7600ba6f3e4336e1e"; - sha256 = "1584f90f6v0iky8xzp85yywilqxgqikrlfn6wc5bkvmm17k5bx3y"; + rev = "1973cb1cdf39a3e2005326713dbb1192fd977c22"; + sha256 = "1xxn6ys2c7vmhaig9280p7zd8mqfml6d5df9dzyw814f8bp5brqm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6923,12 +6935,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-07-21"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0"; - sha256 = "0qkb5bwd6l17j52pi405ma1iq0lidqz300m3322jv8z8fhagp8si"; + rev = "6f426c34c8e21af2f934e56be9d1198a507ecc9f"; + sha256 = "167d9df5a3sh69frklk70ff3aw9ks33cc1v6y32iky8i16479zfi"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7023,8 +7035,8 @@ final: prev: src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "f30449ca11321cc6dc3634774f04b0c665756d2f"; - sha256 = "0sh82p52ilzd2f71khl2q8zxclm415d8x733rxj82h6mi8rda2m6"; + rev = "9c89730da6a05acfeb6a197e212dfadf5aa60ca0"; + sha256 = "1ginwysk4apjx2f045isidnzw863zrv272bdmzh247vi5za57c1k"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -7103,12 +7115,12 @@ final: prev: nvim-pqf = buildVimPluginFrom2Nix { pname = "nvim-pqf"; - version = "2023-06-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "90c7e33245e807eea85fadc6360a1d053406bc2c"; - sha256 = "1rcvp90ipsgv33if63a0fivfp5gi5qrgk6z8s7kycwdqkcf2fzrq"; + rev = "f0ab5ea8388af8e6c1a7f7cdc07292b07c02662d"; + sha256 = "14m36146n0bbc0dfwpdyj4bcszaj31qfr7vwk70lhd1gynbsc40g"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7139,12 +7151,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-07-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "f74fa963249f5924871f6aff6dddf180fc4a130d"; - sha256 = "0dfdzdrsjvjsifaga47b0g11wi64wpmzj61h6hfc0krw3mjs0va5"; + rev = "5a8a24a80774236bde6557ce3a98346b3e4133f9"; + sha256 = "0k9m2vmb2xhhv7a5dr1yxv7hwhwnl1x4m6f2y3caylrhdydq0l57"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7175,24 +7187,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-07-18"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "1ef252c1bf569b88e7e2fafde1eb0861d4f06aa3"; - sha256 = "0z5yjxzm5psjgpwvl63y8lwnagk395xmmf5f2izwkgpfvxr33ipk"; + rev = "3ba6edeea1390457caaf73e96ab9c086ff6f90e9"; + sha256 = "1c949pvry9qzwrd5736llnqgp4111jrj2gvrkbg8chwm9jyh75a4"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPluginFrom2Nix { pname = "nvim-spider"; - version = "2023-07-12"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "430d1772869f626c1b97c3d255cdcee5945e9b14"; - sha256 = "0avy3zqayf8xljmwf59v6i4fdy9rp2r3xq2hknl9r2r0qbbr103r"; + rev = "b268dfcdd00e75d8c3f3576da7f89dfe14cadeec"; + sha256 = "18ik049anbdcadj3myn5y78qz62x8amrdibr2avkrb0ay9bfvjaj"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7247,24 +7259,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-07-16"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35"; - sha256 = "0k4n0b88qxm6h5fprapcf1rl9swdqcj0qp6ncjhahvangldsfv9g"; + rev = "273c1700eb68c27dce4e518efafc8144fd7ce4ab"; + sha256 = "1cs0nkjmmd8gqlwk68zqy9hr2s86hybacmqxvf7n69f8q3539g38"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-07-21"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a8ac8419c420f3564e5212ecbeba3283cfa9e78e"; - sha256 = "0b4j40a4xbvfb9lkx3pjvp0hyns8kd93qrma05lbygd5ighbn3wg"; + rev = "74a7da4e4be5ee71e9efb6d7bdffa16ad620cc57"; + sha256 = "017fp6rmqqf60br9fzc0xkndxcbq68s092k80ac4p47cqwr3blqn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7319,12 +7331,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-06-26"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "52f1f3280d9092bfaee5c45be5962fabee3d9654"; - sha256 = "1k0065mn4hb3ama3qxrln24rf7cqziysddvw4anxws85dan5x9sj"; + rev = "9e519b6146512c8e2e702faf8ac48420f4f5deec"; + sha256 = "1asdjyk9kp4aip9qc2q6ic2jkc8g3ilzjqvxqskjc2jq21fyscp9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7559,12 +7571,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-07-20"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "8e162186c85b97cc8439b3427d161c2aefa30aa8"; - sha256 = "1aqgfnqqzxn0dvbklylzznvnk7cvah1a4qgx3dfp01l69f3pmfmy"; + rev = "fdd6d80011ad7b1496ce758af0fc1bcd147dc2b1"; + sha256 = "10mw26pa9v3gk77jxcwir4ci2n8y496rldjj7ghlpxcc572aybaw"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7643,12 +7655,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-07-20"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "b5e12db00e88a9183fd19d9868698d85aec96aca"; - sha256 = "0w016pgkdcrgjviz1banjnr85fp09kyx7wc8h0xwnlxr16d812lm"; + rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b"; + sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7918,6 +7930,18 @@ final: prev: meta.homepage = "https://github.com/sotte/presenting.vim/"; }; + preto = buildVimPluginFrom2Nix { + pname = "preto"; + version = "2023-02-10"; + src = fetchFromGitHub { + owner = "ewilazarus"; + repo = "preto"; + rev = "d7f5205ab63dcbfa80abbc18badd51aa0d9965b1"; + sha256 = "1l9s6linmjy7wlxsp4gipffnxakwvi1037phcnsr294c920d4dz5"; + }; + meta.homepage = "https://github.com/ewilazarus/preto/"; + }; + prev_indent = buildVimPluginFrom2Nix { pname = "prev_indent"; version = "2014-03-08"; @@ -8149,12 +8173,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-07-19"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "85cf9cb68ae4303f4c1deaf1a2009f098664e6c8"; - sha256 = "060vp6hrvkx4ip4izwcg3p2w01k0d2bx5rzb4r9lzgsa7j54wxhj"; + rev = "7d57e01a9ae012c7aedd73f518d45608a772eb1f"; + sha256 = "12r8qd6c0c3ij4md3vvbl4kyfw91j3lb3kl10hknaar5kjibs2kg"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8461,12 +8485,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-07-20"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "c59929296e0d6c9cee7c5aea80df22d437e734bb"; - sha256 = "0q240jnllqg6pqy8krpl73rvaxrk01fsdwclnwmj35a7lyq7m0jl"; + rev = "3fdedc7f14ee3967e2b0a49d51fdef1f92b802af"; + sha256 = "14lf8izgkr5m0w41k63vp2r2b2ll0zvjkm5c6lqrm3i7cmmln229"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8821,6 +8845,18 @@ final: prev: meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; + starrynight = buildVimPluginFrom2Nix { + pname = "starrynight"; + version = "2021-09-09"; + src = fetchFromGitHub { + owner = "josegamez82"; + repo = "starrynight"; + rev = "241a94cb0a206efc6fc5f403834c39baf7ad1176"; + sha256 = "1g2vvvvw1qg9ipfkpvijmkswa6rhh3rnizjmx1h5ghkvgxsr1ryl"; + }; + meta.homepage = "https://github.com/josegamez82/starrynight/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch.vim"; version = "2014-09-21"; @@ -9004,12 +9040,12 @@ final: prev: tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; - version = "2023-06-03"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "kdheepak"; repo = "tabline.nvim"; - rev = "1f77f520249d508eebff462e103ed699ecf5dc5f"; - sha256 = "1c5hpjv7w6r65kadrxywqbp21k527pzrpmqchyxcjjplc1gzq9p4"; + rev = "ff33d12a20d52daafa5393162cae4108faf8128b"; + sha256 = "0kcirs2b1398vwgdn045rfbpx6qrai7nxwsbwsvykwk7glmaa8vh"; }; meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; @@ -9427,12 +9463,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-07-17"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "47c755d737702df7a39b640c8d9c473a728be1df"; - sha256 = "0k81q31y3r4kcaxrxami1f8ms4zn8ai61rvqhrlz5yvn4rcplnhy"; + rev = "1228f3b15ca3d9b95dcb92efda6a3448871030bd"; + sha256 = "0qqvh3dq86djb8jf4p6icmbkswj5024a6ll1nkyjmmqm04k74q0m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9764,12 +9800,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-07-16"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "20d1b30d6925213abece21d35858a16e11d1e9fc"; - sha256 = "0d040c803p81dfscla5xzf3nzldxl9aflvm6gj6byp8l6lmc1w49"; + rev = "fc4bb22b1d2cd5eb46fe61a9f6d6416d742beb5c"; + sha256 = "0mhhjl4q45bn0i22jqri6v3rp24d7l3k2q72ggx5i1xinxls3ap5"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9896,12 +9932,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-07-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "9456a155a9073f0bbdc5d4922916d81d83008436"; - sha256 = "04p6yzl41wi5y77qkkdz631jjmv92wgm2wyf7sz62zdsx3l7jfyj"; + rev = "6d050d5bc74645cb572c01a0a5c8d2eb28479c71"; + sha256 = "07w8lskf4scx7knkaknc9ba1g7hk3b1jmx7mn6qfxmxf4kx5i2vd"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9992,12 +10028,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-07-05"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "2d8b2d2003c01e1fada6ec23938f6f983540a2a5"; - sha256 = "1hrg0172p85q227x8w070jx5qglnl4wqm9n48hcg10wn9sncm6xw"; + rev = "830e7187949fb6b12cfa5c45acb98d3ffc320d5b"; + sha256 = "1q5039fcm1skpxxp01lqvcx0hh5hq331zxwcslva8v38wy195pqw"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12322,12 +12358,12 @@ final: prev: vim-just = buildVimPluginFrom2Nix { pname = "vim-just"; - version = "2023-07-14"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "f678f5ef3d6bc589e88b7f1da6e969a5f67a99dc"; - sha256 = "1929imvqk77zi34x9h0kfvhwn7gagimsn2gr3zs0nq0ynfpx5h54"; + rev = "8e5c882f8d6fb213b160ac2cbb5b28fea620ed0b"; + sha256 = "17k073vbx4b2cll0n4pj33c3znmd7df4ln6fr3l6yswlcd6byabh"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -12947,12 +12983,12 @@ final: prev: vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2022-04-25"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee"; - sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av"; + rev = "b5da592a45418d02b116ebf686ee3786b419d80a"; + sha256 = "1lb6zxz577zmyjsrk47apvyik7hl3xbrls20fxx10qp4ksnjms0q"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -13221,6 +13257,18 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; + vim-paper = buildVimPluginFrom2Nix { + pname = "vim-paper"; + version = "2023-03-16"; + src = fetchFromGitHub { + owner = "yorickpeterse"; + repo = "vim-paper"; + rev = "47f6ca5452a718c2e3b95a9c75932d34b2a8f5ae"; + sha256 = "04wj853rlxm8bzzcasc1ib4npf8m81nwrqapxpmh7pv3hcg56k69"; + }; + meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; + }; + vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; version = "2022-11-29"; @@ -14256,12 +14304,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-07-10"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "155342d6c8137a8a5dfbdbfca2de831643b2e006"; - sha256 = "147vrnwal7l306l1r9cyd2hrdams0ghzb1fyf9c7yfihak2ag2jg"; + rev = "63d317c2f6c34e561987d4ab0aa003d8391c4033"; + sha256 = "0blxanzxlszxl5yyn21wix99slgbnsdib5bc88rngsvwvr4j265k"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15001,12 +15049,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-07-19"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "08371bf97a9c4ce3dbdf996161faf04ff8b32aa0"; - sha256 = "1il9cq6y7yi82vpqf1dyabjx0dsc2nr91bwjvbpfqmk2zzap2j8d"; + rev = "9da5481ca32d4c903228e4e30b5d8ccdd46e6a94"; + sha256 = "1hayvndfzvr839zv76mhkqr7vyi2q3y140hxrc5vz0bkk0hc6w8w"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15157,12 +15205,12 @@ final: prev: wiki-vim = buildVimPluginFrom2Nix { pname = "wiki.vim"; - version = "2023-07-20"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "1c733d36026c4f9c9dac742c73a23f24838e6fef"; - sha256 = "01ff7cj784h2w970hmjmvhbv8f76wla3b1pnhsvrgfl2rlcf6gd9"; + rev = "4bd7d1b21a0197f11b336cefb434132b5e595dcf"; + sha256 = "176v8idcjv32q4kywdrr5xqpj849ckcdlvqybv04mhd6wcnq3xzr"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -15181,12 +15229,12 @@ final: prev: wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire.vim"; - version = "2022-05-05"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "b371e2b1d938ae0e164146136051de164ecb9aa5"; - sha256 = "0lpv10330818aza0fv8adzswnq8jq47z043p6gqfn7b7h2visy5p"; + rev = "dfcf48aad2e80c63272df67a1b81e37cbc443412"; + sha256 = "1m8i737dayw1fs67k1lszgs5zgfqm8krr4scp287cackgvg1kznd"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; @@ -15324,6 +15372,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yescapsquit-vim = buildVimPluginFrom2Nix { + pname = "yescapsquit.vim"; + version = "2022-08-31"; + src = fetchFromGitHub { + owner = "lucasew"; + repo = "yescapsquit.vim"; + rev = "68290b5869bebe093ccc87ee80d15688ac2b104d"; + sha256 = "1wqxmrzg111ri9wiri73kyyms0bg7jnny3d86bvlr8c0wrd5c2vb"; + }; + meta.homepage = "https://github.com/lucasew/yescapsquit.vim/"; + }; + yuck-vim = buildVimPluginFrom2Nix { pname = "yuck.vim"; version = "2022-10-29"; @@ -15398,12 +15458,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2023-06-23"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "0c4f965468259ab6e47fd7c6b2127583a8860eb1"; - sha256 = "052jmw1pzqydg4icsq2s7vn66wyn2ki4lzpln2fzxx9r9hbwfi8m"; + rev = "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e"; + sha256 = "0m9p0055x6j5bz7whln7arz6w7cn02wq4rgs1ynczrvbqd68iji2"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -15506,12 +15566,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-07-21"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "f4bfc448a837bb913bd971676ebcd94e0f3134c0"; - sha256 = "0lxjf9zzch6zsmi9v976n95wcr1zzl2q0ha28mzppvnnd8w837ab"; + rev = "31b4b4336d05e7c8ff0f833a493de2a2875f1b38"; + sha256 = "0m426zxd6liah3xfdnxjs289c27z31fw8r0fdw8dvnvgsbhz1a2v"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -15528,6 +15588,18 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; + nightfly = buildVimPluginFrom2Nix { + pname = "nightfly"; + version = "2023-07-19"; + src = fetchFromGitHub { + owner = "bluz71"; + repo = "vim-nightfly-colors"; + rev = "cd68ec3c0a3ca2bf15072dd2040401ea4b89e79f"; + sha256 = "00nfpkpv0li3wgh926azp8xf1zvdh3zc6fx5aznplhs9j6xbdx21"; + }; + meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; + }; + nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; version = "2023-05-03"; @@ -15542,24 +15614,24 @@ final: prev: nvchad-extensions = buildVimPluginFrom2Nix { pname = "nvchad-extensions"; - version = "2023-07-11"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "nvchad"; repo = "extensions"; - rev = "0b8d75a10032d7f0cd0c6758e5f28195a0d62637"; - sha256 = "0b6jacncd3p5znxmwbivc05wbr8xc5pi9n69dvdzbsd9frickwp3"; + rev = "0abb3ead8ce6ffa0e03b596a000d231b5e5d406b"; + sha256 = "13bngm38j90n21szilc27bpdzgjk4g41a6a8yz1bc60rddxxjxr3"; }; meta.homepage = "https://github.com/nvchad/extensions/"; }; nvchad-ui = buildVimPluginFrom2Nix { pname = "nvchad-ui"; - version = "2023-07-14"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "5545a7ef32cec4147c75156e59afd293305f639d"; - sha256 = "1ysx0zic7jvlxidjghc1k2vrigh93d1wnqf74xgb14xzsrs3bgc6"; + rev = "c4c1f41deb8102bb68f168795d1dcc036e098f98"; + sha256 = "0ddkq6dnk45n2rnzjvfkr2r1iq67fbdg8s61r1cpk7a7dgq9j2v3"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -15590,12 +15662,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2023-07-21"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "4ac66839a5cd138f26a2a107b9dd233177260346"; - sha256 = "1dm2lr5v0ygj66daacmqkvbc1rpmhx5p778bi51wlxcya31id0sk"; + rev = "e10340767534b4988992de838d6c811db63b74db"; + sha256 = "1a58a3xdl3wvs54sbmyyjs6mps8icp7r0g287i3h5jam10vabw3n"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e158937caca..fe10e57a843 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -436,12 +436,12 @@ }; elvish = buildGrammar { language = "elvish"; - version = "0.0.0+rev=f32711e"; + version = "0.0.0+rev=5e7210d"; src = fetchFromGitHub { owner = "elves"; repo = "tree-sitter-elvish"; - rev = "f32711e31e987fd5c2c002f3daba02f25c68672f"; - hash = "sha256-/3npcIfTH8w5ekLTb//ZCTxuSGhOXkUBaCq3WWcK2J4="; + rev = "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"; + hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg="; }; meta.homepage = "https://github.com/elves/tree-sitter-elvish"; }; @@ -458,12 +458,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=5dba13d"; + version = "0.0.0+rev=7aa24fe"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe"; - hash = "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog="; + rev = "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"; + hash = "sha256-7rhwMBq5u5bVjyCE4j3f5tzY+9jL80Xd5hgkJjlqSr8="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -513,12 +513,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=31552ac"; + version = "0.0.0+rev=482bdb8"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "31552ac43ecaffa443a12ebea68cc526d334892f"; - hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM="; + rev = "482bdb8b8fb7305b928937379820aa6449e359a7"; + hash = "sha256-x2Cm1yUfhlkl8zgbQFPe/IxVNGpX050J3wjsqe7uOW8="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -1151,36 +1151,36 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=936cc84"; + version = "0.0.0+rev=aaf7679"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "936cc84289f6de83c263ae8e659fb342867ceb16"; - hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM="; + rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; + hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=936cc84"; + version = "0.0.0+rev=aaf7679"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "936cc84289f6de83c263ae8e659fb342867ceb16"; - hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM="; + rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; + hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=676117e"; + version = "0.0.0+rev=1558d8f"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "676117eafa64afedc8380a921a77cd9f2244bc6b"; - hash = "sha256-VB+SO89WAAPh1wj4E1nuHLzNNixBQrF3HcUeqrqV5dk="; + rev = "1558d8fc85f7810fa567292ad2a7e64913fa78a1"; + hash = "sha256-3FKUGmMM3OeRXkS+izu5yrTgiewp5nHN2352t6sYurU="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1286,24 +1286,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=ee871b5"; + version = "0.0.0+rev=694c577"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "ee871b50b845b6adaa22e85aa3c794a3fd49b1fb"; - hash = "sha256-2WhK69OGHeQWQZPkBdfrybgxO2oDwHSn1c/AzQe9hAw="; + rev = "694c57718fd85d514f8b81176038e7a4cfabcaaf"; + hash = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=ee871b5"; + version = "0.0.0+rev=694c577"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "ee871b50b845b6adaa22e85aa3c794a3fd49b1fb"; - hash = "sha256-2WhK69OGHeQWQZPkBdfrybgxO2oDwHSn1c/AzQe9hAw="; + rev = "694c57718fd85d514f8b81176038e7a4cfabcaaf"; + hash = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1509,12 +1509,12 @@ }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=8e13a37"; + version = "0.0.0+rev=9ce9a5f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "8e13a3768091703ac27ef1e5763e542af7f6dead"; - hash = "sha256-vBxCqFsSF2kwUK5uNWDPvl7F+mcD8rdTzsckcab4vUU="; + rev = "9ce9a5f7d64528572aaa8d59459ba869e634086b"; + hash = "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; @@ -1641,12 +1641,12 @@ }; robot = buildGrammar { language = "robot"; - version = "0.0.0+rev=f1142bf"; + version = "0.0.0+rev=51b82cf"; src = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-robot"; - rev = "f1142bfaa6acfce95e25d2c6d18d218f4f533927"; - hash = "sha256-Nd38FJZsSEr3R7S6e8nyoJTqZbbDCtlcvwqWrjvz2d4="; + rev = "51b82cfd0c824681b6a282663820a5ce54243e55"; + hash = "sha256-jRLP5LqA/Q3IosK0n5sLJ2SW/wXTo9ia1zpdnos/QN8="; }; meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; }; @@ -1986,12 +1986,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=e5fa28f"; + version = "0.0.0+rev=b1bf482"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "e5fa28f919e0b1ed1961af9adf9a1e7a71271104"; - hash = "sha256-1kyW5tohk3byP/sWM7Edv8N3tWin65k7h+nkKBMQGAg="; + rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; + hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2020,12 +2020,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=e5fa28f"; + version = "0.0.0+rev=b1bf482"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "e5fa28f919e0b1ed1961af9adf9a1e7a71271104"; - hash = "sha256-1kyW5tohk3byP/sWM7Edv8N3tWin65k7h+nkKBMQGAg="; + rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; + hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2165,12 +2165,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=1f8736f"; + version = "0.0.0+rev=23712ef"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "1f8736fc86204a045644e0086bee68f7171e1967"; - hash = "sha256-cguDviBdQPOLOwoM/jhGNasQyjN1IfLw5Eg9DVjnU1s="; + rev = "23712eff9768576bdd852cb9b989a9cd44af014a"; + hash = "sha256-IWqclJM3CKsgXIy3e6pUrd2iLfIu8QZT2k6eZXRpITA="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ea62e01b717..4903bc662a6 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -932,7 +932,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-Xlhy2yfB99Tu0j7rXRC6UkdcV0MW09olyxcC2gjd7h4="; + cargoHash = "sha256-KhUCIAGSgf7TxabEzcjo582VgbSU79QSGlaEP7BbJCE="; nativeBuildInputs = [ pkg-config ]; @@ -1055,9 +1055,8 @@ self: super: { svedbackend = stdenv.mkDerivation { name = "svedbackend-${super.sved.name}"; inherit (super.sved) src; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ - gobject-introspection glib (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 69601641a9f..1cee9362cc6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -346,6 +346,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/phaazon/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, @@ -665,6 +666,7 @@ https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, +https://github.com/ewilazarus/preto/,HEAD, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, https://github.com/kevinhwang91/promise-async/,HEAD, @@ -741,6 +743,7 @@ https://github.com/chr4/sslsecure.vim/,, https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, +https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, @@ -1090,6 +1093,7 @@ https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, https://github.com/nickel-lang/vim-nickel/,main, +https://github.com/bluz71/vim-nightfly-colors/,,nightfly https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, @@ -1114,6 +1118,7 @@ https://github.com/lambdalisue/vim-pager/,, https://github.com/vim-pandoc/vim-pandoc/,, https://github.com/vim-pandoc/vim-pandoc-after/,, https://github.com/vim-pandoc/vim-pandoc-syntax/,, +https://github.com/yorickpeterse/vim-paper/,HEAD, https://github.com/bhurlow/vim-parinfer/,, https://github.com/sickill/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, @@ -1290,6 +1295,7 @@ https://github.com/tweekmonster/wstrip.vim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 4fa4270d00e..da75dff14de 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -24,21 +24,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xqcksnjdph81cc39qs1q0w6av2c3p3l64bws4iwndbxwvmrxqb0"; - x86_64-darwin = "1mh75kfrycm8rxs99z025sh9l9hry9rdp69njrb1p08dxrrslb45"; - aarch64-linux = "1755hiicbyq85bacn1cclnmg7k6xmgpgdiziar9rw14vp1kfid40"; - aarch64-darwin = "0498grcdlnm9kaxr61p3q46dp9q92i43wi6myfibky2nhqccad34"; - armv7l-linux = "04481jyvfdyq702x88raa5frspzya0158173blwcrmpgw8dda4fn"; + x86_64-linux = "05yl6v11ndayz081m3j6dhclj0hshsf0ism7z31hmq6qvfl1sw0k"; + x86_64-darwin = "16x1ppfi3n9gnxg2la2pzj67mlj507879hpqinhpz57dvys421h8"; + aarch64-linux = "0m5k9rm14isj9x1j3nw3zvcxxz523396id7yhi8bpncr4ac8a087"; + aarch64-darwin = "1kbhf3v71qhw4ql6pp8x5m68lgycjzxzm17c9ri0zn0b86ffp8d3"; + armv7l-linux = "07lp0schicpnzs52gfbi9y8zfkwxhh92zv29afzy6vxdlqvmrf21"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.80.1"; + version = "1.80.2"; pname = "vscode"; # This is used for VS Code - Remote SSH test - rev = "74f6148eb9ea00507ec113ec51c489d6ffb4b771"; + rev = "2ccd690cbff1569e4a83d7c43d45101f817401dc"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -62,7 +62,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1f5x53hsql8z54jv0wxgmx2j1fglvfs6ml7x6l5d58sh6wfkkpp1"; + sha256 = "1425bngv0n2xpd7yp9xbmxv95adr9vv0vzy1wvqvgpd8p6h05r7n"; }; }; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 63e03bc00ad..a07d899ee74 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -360,6 +360,17 @@ in }; }; + dosbox-pure = mkLibretroCore { + core = "dosbox-pure"; + CXXFLAGS = "-std=gnu++11"; + hardeningDisable = [ "format" ]; + makefile = "Makefile"; + meta = { + description = "Port of DOSBox to libretro aiming for simplicity and ease of use."; + license = lib.licenses.gpl2Only; + }; + }; + eightyone = mkLibretroCore { core = "81"; src = getCoreSrc "eightyone"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 1b52cda5c1e..410e782d0a9 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -1,9 +1,9 @@ { "2048": { - "owner": "libretro", - "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + "owner": "libretro", + "repo": "libretro-2048", + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", + "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" }, "atari800": { "owner": "libretro", @@ -144,6 +144,12 @@ "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" }, + "dosbox-pure": { + "owner": "schellingb", + "repo": "dosbox-pure", + "rev": "035e01e43623f83a9e71f362364fd74091379455", + "hash": "sha256-j7Or4yTK5l+ZVC5UFeym9sLx+88PRlofoBT1tMuf31A=" + }, "eightyone": { "owner": "libretro", "repo": "81-libretro", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index bd325e5739a..a091958c38b 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -36,6 +36,7 @@ CORES = { "desmume2015": {"repo": "desmume2015"}, "dolphin": {"repo": "dolphin"}, "dosbox": {"repo": "dosbox-libretro"}, + "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"}, "eightyone": {"repo": "81-libretro"}, "fbalpha2012": {"repo": "fbalpha2012"}, "fbneo": {"repo": "fbneo"}, diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 0042c8f8729..199edc8e918 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.968"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c"; - sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5"; + rev = "487261592eb9e9c31cacd08860f8894027bb1a07"; + sha256 = "002qgnh7xb9i9yqm4a3m9m7sbx1iz7ng8k5nnanlq897djs3hy0g"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 6cc70c819a4..3a509ea5fc6 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -133,7 +133,7 @@ (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.3-build25"; sha256 = "190gqalpkhw1zb3pvb92dxrciyn1giznl125vxxx9gsy8a6cipka"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index e35428a5a0d..23fcf4a4422 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.10"; + version = "8.13"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-xPNt1zwXbO+OcBbKQTnudvW0mKSv1+21F+FMDVOUc28="; + hash = "sha256-JuXTqD0lxUGMbA9USORD0gh2OiZDqrSw8a01KSKkwnU="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-4EHzverfPu4PoRvbeH/iaGqNoXk6XgneDpKOuMf9P1g="; + hash = "sha256-5upC+IWHBJE5DeFv96lD1hr4LYYaqAAzfxIroK9KlOY="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index dd4d9b35ee3..039306ca662 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.103"; + version = "0.7.104"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-yBeaRZH8YVrZATBLpUPheS2SY/rAKaRc3HKtFHKOV8E="; + hash = "sha256-Oo8YwCDl2E8wW4NIO2KeGRX3GZ/pDVsnHEzEDXkLkN8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index c4c2d9e6528..f07309a8ad8 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.10"; + version = "1.13"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kXnI8a1nGKBDc+isv9RYvputKk+/FHmM9j+G4UnI5Z4="; + sha256 = "sha256-Y9z3HT36Z1fwweOnniRgyNQX1cbrLSGGgB5UAxkq9mI="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index e0b9954e1f5..ef28d8cea34 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -49,7 +49,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib gtk3 - gobject-introspection libhandy librsvg ]; @@ -67,9 +66,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "portfolio-filemanager"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index ab75938760b..8a95d10203c 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -54,7 +54,7 @@ , breeze-icons , oxygen -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index 300e7f7bb5d..b6c04721404 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04="; }; + separateDebugInfo = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ imagemagick pkg-config wayland-scanner ]; buildInputs = [ wayland wayland-protocols ]; diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 008cfc5d2ba..48ef9fc8c01 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -47,7 +47,6 @@ python3.pkgs.buildPythonApplication rec { libadwaita libnotify webkitgtk_6_0 - gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ @@ -81,9 +80,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "komikku"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 9e516f21106..1c473d2c41f 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { intltool itstool libxml2 + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection goocanvas2 gtkspell3 isocodes diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index b283a6d4083..490a89b30b8 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -26,6 +26,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { nativeBuildInputs = [ file intltool + gobject-introspection ]; # Package has no generally usable unit tests. @@ -37,13 +38,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { $out/bin/rapid-photo-downloader --detailed-version ''; - # NOTE: Without gobject-introspection in buildInputs and strictDeps = false, - # launching fails with: - # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ gdk-pixbuf gexiv2 - gobject-introspection gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -54,6 +51,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec { udisks ]; + # NOTE: Check if strictDeps can be renabled + # at the time of writing this the dependency easygui fails to build + # launching fails with: + # "Namespace [Notify / GExiv2 / GUdev] not available" strictDeps = false; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 11ddc7c7db3..2dfc42c97ae 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "scantailor-advanced"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "vigri"; repo = "scantailor-advanced"; rev = "v${version}"; - sha256 = "sha256-4/QSjgHvRgIduS/AXbT7osRTdOdgR7On3CbjRnGbwHU="; + sha256 = "sha256-mvoCoYdRTgXW5t8yd9Y9TOl7D3RDVwcjUv2YDUWrtRI="; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index d4a5163975f..2752eaff87d 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-zAvwT6tlL4+EYxJSjnb3Eud1MVbj7Yz4vJcrqM5jXDQ="; + hash = "sha256-hx7daXVarV4JdxZfwnTHsuxxijCRP17gkOjicI3EFlM="; }; postPatch = '' diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 525ab9788c5..ed9b32256aa 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.4"; + version = "1.26.5"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - hash = "sha256-l/sPqXkr4rSMEbPi/ahl/74RYqNrjcb28v6/scDrh1w="; + hash = "sha256-6/acpPMHsMj/8GkLGNE8yg/apt8ynhN3O35lkA95HYQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index d811540e589..ef91009391b 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: rec { pkg-config makeWrapper wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -106,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: rec { cairo.dev dblatex gnumake - gobject-introspection graphicsmagick gsettings-desktop-schemas gtk3 diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 0261f983ac7..7e366d19d54 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.35.1"; + version = "1.44.1"; desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ="; + sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg="; }; nativeBuildInputs = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ]; # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 81b7a54a754..f6f5edc84ef 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -5,7 +5,7 @@ , openvdb, libXxf86vm, tbb, alembic , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , hipSupport ? false, hip # comes with a significantly larger closure size , colladaSupport ? true, opencollada , spaceNavSupport ? stdenv.isLinux, libspnav diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 833ecd32788..2825b371e06 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -38,7 +38,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 atk - gobject-introspection libhandy libnotify pango diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix index 6b1fc50b316..ad95480c642 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/applications/misc/cartridges/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; - version = "2.0.5"; + version = "2.1.1"; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-d3KBZNnk5sU60CI9yOYaW8rzbY5tw6BQT8RaiD5P4Co="; + sha256 = "sha256-jycTLKTHKhxd4t+3NB23Tf1oAvqiDHHsNmS6uLikgGA="; }; buildInputs = [ diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index a1430a8b5e3..d8f8932fd73 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -59,8 +59,6 @@ buildPythonApplication rec { buildInputs = [ atk gdk-pixbuf - # Needed to detect namespaces - gobject-introspection gst-plugins-good libhandy networkmanager diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index ec177c0aa72..99dc80e986a 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libhandy libnotify diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 8c04161844b..519f12490f1 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 glib - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base libsoup_3 @@ -70,9 +69,7 @@ python3.pkgs.buildPythonApplication rec { # handle setup hooks better strictDeps = false; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/dialect-app/dialect"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 9424ceeee51..173afec4aa6 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -12,8 +12,8 @@ in buildPythonApplication rec { version = "5.1.4"; pname = "gramps"; - nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; - buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] + nativeBuildInputs = [ wrapGAppsHook intltool gettext gobject-introspection ]; + buildInputs = [ gtk3 pango gexiv2 ] # Map support ++ lib.optionals enableOSM [ osm-gps-map glib-networking ] # Graphviz support diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index 4b1f1abda9e..918f463699a 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -1,20 +1,34 @@ { lib , rustPlatform , fetchFromGitHub +, stdenv +, pkg-config +, darwin +, xorg }: rustPlatform.buildRustPackage rec { pname = "kbt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "kbt"; rev = version; - hash = "sha256-gZUZB7cbaYlDs3PfRhkRlyJ6FBqtUAANL/K8Q/Dk8Zc="; + hash = "sha256-dC/o5VzdhoggEgY2LvdapT4CuSdz2iI+zbv3RZD/8XU="; }; - cargoHash = "sha256-BcUxrZKJEgYgGQqgi9l6xcmwyTRNr9C2WWOgaFB5XSw="; + cargoHash = "sha256-UVTUcc8OeGdCRGFt9FV1rQuOsVWmh2KEDpu1jSC0XHM="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ] ++ lib.optionals stdenv.isLinux [ + xorg.libX11 + ]; meta = with lib; { description = "Keyboard tester in terminal"; diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index ccf56da05a2..436891482f1 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook gobject-introspection ]; buildInputs = [ - glib glib-networking gobject-introspection gtk3 json-glib libgee libhandy + glib glib-networking gtk3 json-glib libgee libhandy libsoup ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 23edd6e2742..ad2850910cb 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -22,8 +22,8 @@ buildGoModule rec { vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; - buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ cairo gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; doCheck = false; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 4395cf7721d..4d8d3aa7811 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -67,7 +67,6 @@ mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = pname; extraArgs = [ "-vr" "(.*)-android" ]; }; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index fa6b1f86e03..87847e32f6c 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-1d+zox46h22ox9zC+SvN3w3LkpHmN1jpf/tDPD5D80s="; + sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/applications/misc/pop/default.nix new file mode 100644 index 00000000000..52329034a07 --- /dev/null +++ b/pkgs/applications/misc/pop/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, installShellFiles, fetchFromGitHub }: + +buildGoModule rec { + pname = "pop"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "pop"; + rev = "v${version}"; + sha256 = "VzSPQZfapB44hzGumy8JKe+v+n6af9fRSlAq1F7olCo="; + }; + + vendorSha256 = "VowqYygRKxpDJPfesJXBp00sBiHb57UMR/ZV//v7+90="; + + GOWORK = "off"; + + nativeBuildInputs = [ + installShellFiles + ]; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + postInstall = '' + $out/bin/pop man > pop.1 + installManPage pop.1 + installShellCompletion --cmd pop \ + --bash <($out/bin/pop completion bash) \ + --fish <($out/bin/pop completion fish) \ + --zsh <($out/bin/pop completion zsh) + ''; + + meta = with lib; { + description = "Send emails from your terminal"; + homepage = "https://github.com/charmbracelet/pop"; + changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ caarlos0 maaslalani ]; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 10bb6a78270..70d30ea054e 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -33,6 +33,7 @@ let pkg-config wrapGAppsHook wrapPython + gobject-introspection ]; configureFlags = [ @@ -47,7 +48,6 @@ let ]; buildInputs = [ - gobject-introspection gtk3 python ] ++ lib.optional withRandr libxcb diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix index 5b1332a91d7..947c8f15b0b 100644 --- a/pkgs/applications/misc/shipments/default.nix +++ b/pkgs/applications/misc/shipments/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libhandy (python3.withPackages (ps: with ps; [ diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix index 24d0253aaf8..520f4330e50 100644 --- a/pkgs/applications/misc/siglo/default.nix +++ b/pkgs/applications/misc/siglo/default.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { python3 desktop-file-utils gtk3 + gobject-introspection ]; buildInputs = [ gtk3 python3.pkgs.gatt - gobject-introspection ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index c1a77d634d3..d347bb3af57 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -20,7 +20,6 @@ python3Packages.buildPythonApplication rec { }; buildInputs = [ - gobject-introspection gtk3 gtksourceview4 # webkitgkt is used for rendering interactive statistics graph which diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 55d9678edd4..e9cacc00652 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.21.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-6Jg56lQR8oK9TaJNqnEu70JkUz9OomvRbm5to2j3NOA="; + hash = "sha256-EbTmxnUk2taAKWPNuoVcKybKgdvPegFjz/ImTIabZ7Q="; }; vendorHash = "sha256-Ypu3AKnjh2lDh43t1GZMJo7ZyEDyNbPWvoePLp+WQdI="; diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/applications/misc/ssw/default.nix index f3dc8e136a1..062f1063691 100644 --- a/pkgs/applications/misc/ssw/default.nix +++ b/pkgs/applications/misc/ssw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ssw"; - version = "0.6"; + version = "0.8"; src = fetchurl { url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz"; - sha256 = "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj"; + sha256 = "sha256-hYnYKY/PO1hQ0JaLBIAaT0D68FVVRPbMnZVLAWLplUs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 06cb3179821..57dafc0e3ba 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib - gobject-introspection cinnamon.xapp gspell ]; diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix index ce5672337be..babd312d3ed 100644 --- a/pkgs/applications/misc/swaysettings/default.nix +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ accountsservice dbus glib - gobject-introspection gsettings-desktop-schemas gtk-layer-shell gtk3 diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 887cdb87608..829def809d0 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -66,7 +66,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { django-storages django-tables2 django-webpack-loader - django_treebeard + django-treebeard djangorestframework drf-writable-nested gunicorn diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index f1a33bc1000..5b97307abcf 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -66,9 +66,7 @@ stdenv.mkDerivation rec { ]); passthru = { - updateScript = nix-update-script { - attrPath = "tuba"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 641723016a8..1b26f455649 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -34,9 +34,10 @@ python3Packages.buildPythonApplication rec { pkg-config meson ninja appstream-glib desktop-file-utils wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gtk3 gobject-introspection + gtk3 glib ]; nativeCheckInputs = with python3Packages; [ flake8 pytest ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index da6d7b48696..db6ab6d6a90 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -38,7 +38,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gexiv2 - gobject-introspection gtk3 hicolor-icon-theme libnotify diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index d01b4b96be7..0a803a4bfd4 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -1,16 +1,15 @@ { lib -, fetchgit +, fetchFromGitea , rustPlatform }: -let - repoUrl = "https://codeberg.org/explosion-mental/wallust"; -in rustPlatform.buildRustPackage rec { pname = "wallust"; version = "2.5.1"; - src = fetchgit { - url = "${repoUrl}.git"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "explosion-mental"; + repo = pname; rev = version; hash = "sha256-v72ddWKK2TMHKeBihYjMoJvKXiPe/yqJtdh8VQzjmVU="; }; @@ -19,10 +18,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A better pywal"; - homepage = repoUrl; + homepage = "https://codeberg.org/explosion-mental/wallust"; license = licenses.mit; maintainers = with maintainers; [ onemoresuza ]; - downloadPage = "${repoUrl}/releases/tag/${version}"; + downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; platforms = platforms.unix; mainProgram = "wallust"; }; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 0a6662c39a9..c9bb4131c5b 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook jinja2 + gobject-introspection ]; buildInputs = [ @@ -62,7 +63,6 @@ stdenv.mkDerivation rec { libSM libXScrnSaver libXtst - gobject-introspection glib glibmm gtkmm3 diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix new file mode 100644 index 00000000000..90ec71e9757 --- /dev/null +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "wttrbar"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "bjesus"; + repo = "wttrbar"; + rev = version; + hash = "sha256-RQeRDu8x6OQAD7VYT7FwBfj8gxn1nj6hP60oCIiuAgg="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + + cargoHash = "sha256-hJCEA6m/iZuSjWRbbaoJ5ryG0z5U/IWhbEvNAohFyjg="; + + meta = { + description = "A simple but detailed weather indicator for Waybar using wttr.in"; + homepage = "https://github.com/bjesus/wttrbar"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index a27c76fde3c..812ecfb16d1 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.19.3"; + version = "6.20.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-mvEmxN7spyQkavAcjW4bVt7xjtRTP77OwHzJ5UqsSoE="; + hash = "sha256-csJfmjKm/uAlINhijeqUsDVTemchlzWqJg/YHtmNlAk="; }; patches = [ diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index f2696c36dbe..2cb4cad91d4 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -29,29 +29,27 @@ , x11Support ? true }: -let - inherit (lib) mesonEnable; -in assert (x11Support || waylandSupport); stdenv.mkDerivation (finalAttrs: { pname = "yambar"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = finalAttrs.version; - hash = "sha256-0bgRnZYLGWJ9PE62i04hPBcgzWyd30DK7AUuejSgta4="; + hash = "sha256-+bNTEPGV5xaVXhsejyK+FCcJ9J06KS6x7/qo6P2DnZI="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ bison flex meson ninja pkg-config - scdoc wayland-scanner ]; @@ -64,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { pipewire pixman pulseaudio + scdoc tllist udev ] ++ lib.optionals (waylandSupport) [ @@ -76,16 +75,17 @@ stdenv.mkDerivation (finalAttrs: { xcbutilwm ]; + strictDeps = true; + mesonBuildType = "release"; mesonFlags = [ - (mesonEnable "backend-x11" x11Support) - (mesonEnable "backend-wayland" waylandSupport) + (lib.mesonEnable "backend-x11" x11Support) + (lib.mesonEnable "backend-wayland" waylandSupport) ]; - meta = with lib; { + meta = { homepage = "https://codeberg.org/dnkl/yambar"; - changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; description = "Modular status panel for X11 and Wayland"; longDescription = '' yambar is a lightweight and configurable status panel (bar, for short) for @@ -112,8 +112,9 @@ stdenv.mkDerivation (finalAttrs: { 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 = platforms.linux; + changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 88a683b2a39..8a13341b119 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-aeO1rjKYoO6KF+oe0FKIa8D3j6G01uyC79OvUg9Qpfk="; + hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY="; }; - vendorHash = "sha256-Rh3S7Qy89ctsKlFz0lNNs8pZ5lHG5yB//DQzffD6eL8="; + vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a6afc2dd937..00553d8383e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "115.0.5790.102", - "sha256": "0sxhhsrn4cg9akpnb2qpn7kkgp286rh8y2mmypm2409s5grf1xh6", - "sha256bin64": "18n7xqbvcdd68856wmbrxx1f5lqj61g9cyiir9dzlfmf0a9wxvml", + "version": "115.0.5790.110", + "sha256": "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79", + "sha256bin64": "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3", "deps": { "gn": { "version": "2023-05-19", @@ -19,15 +19,15 @@ } }, "beta": { - "version": "115.0.5790.98", - "sha256": "1wbasmwdqkg5jcmzpidvzjsq2n2dr73bxz85pr8a5j4grw767gpz", - "sha256bin64": "0xbizb3d539h1cw1kj9ahd8azmkcdfjdmqb5bpp8cr21bh2qbqp5", + "version": "116.0.5845.50", + "sha256": "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz", + "sha256bin64": "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59", "deps": { "gn": { - "version": "2023-05-19", + "version": "2023-06-09", "url": "https://gn.googlesource.com/gn", - "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", - "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" + "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", + "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" } } }, diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 89f02114f42..0508b4a19ef 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -28,7 +28,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = with gst_all_1; [ glib-networking - gobject-introspection gst-libav gst-plugins-base gst-plugins-ugly diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 046200e8208..8c25377f663 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -23,7 +23,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.1.3035.111"; + version = "6.1.3035.204"; suffix = { aarch64-linux = "arm64"; @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-0bUe1Rn3pi08SaUxg+PXRXFD8V/TGVh40hkWSKvalhc="; - x86_64-linux = "sha256-be+dKBxfDLitqstg3mZbwL4bYo4De7rIWp8+k99+a2o="; + aarch64-linux = "sha256-i2eIm4AF7avjy3KSUvoOOKWw7Q+BatozGpy/yyX4Esg="; + x86_64-linux = "sha256-TLuTYXp6EdQDBWPM1TEXwhdxWWMSPKIi5fW+SGUVdRo="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 53e5a3f1680..eea7abd62e6 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2023.7.0"; + version = "2023.7.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-/ELKUjo16BbPhQu1Gzj68peaAy83sGteqolR+BDIA2k="; + hash = "sha256-Sv6f12XXVHIi97Ows1hsqAeb4z+ZtVM5B0v0Xz/b5iY="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index f4e9d5c1cf8..b2ea58eac2d 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.7"; + version = "3.4.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-jvrt8CwYkeZky5xg9a2U/CuenoBe86yX31x2iCb/7EY="; + hash = "sha256-cN1uLy0QHABks99BJqEpLDf2VbYUzLM2iCTTBvcY0es="; }; - vendorHash = "sha256-6vHZxBcmhu6s3qQSX0iNIAR0hvXQB/bbpTA1/R08pj0="; + vendorHash = "sha256-kO4ME0r3MoOjn+83X+8bbkgF7zL/Id2+hKabQjEob+Y="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix index 16fceff4ee1..1a6aa12a91e 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -12,4 +12,6 @@ helm-secrets = callPackage ./helm-secrets.nix { }; + helm-unittest = callPackage ./helm-unittest.nix { }; + } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix new file mode 100644 index 00000000000..9b88d99e44a --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -0,0 +1,34 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-unittest"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-11rgARUfTbr8FkmR2lI4uoIqzi9cRuVPalUOsxsnO3E="; + }; + + vendorHash = "sha256-E9HSP8c/rGG+PLbnT8V5GflpnFItCeXyeLGiqDj4tRI="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/${pname} + mv $out/bin/helm-unittest $out/${pname}/untt + rmdir $out/bin + install -m644 -Dt $out/${pname} plugin.yaml + ''; + + meta = with lib; { + description = "BDD styled unit test framework for Kubernetes Helm charts as a Helm plugin"; + homepage = "https://github.com/helm-unittest/helm-unittest"; + license = licenses.mit; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix index b9322290920..3b13668abf6 100644 --- a/pkgs/applications/networking/cluster/helm/wrapper.nix +++ b/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -31,7 +31,10 @@ in preferLocalBuild = true; nativeBuildInputs = [ makeWrapper ]; - passthru = { unwrapped = helm; }; + passthru = { + inherit pluginsDir; + unwrapped = helm; + }; meta = helm.meta // { # To prevent builds on hydra diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 38bb84d7762..ad50617e9e6 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pluginsDir ? null +}: buildGoModule rec { pname = "helmfile"; @@ -19,9 +25,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X go.szostok.io/version.version=v${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = + [ installShellFiles ] ++ + lib.optional (pluginsDir != null) makeWrapper; - postInstall = '' + postInstall = lib.optionalString (pluginsDir != null) '' + wrapProgram $out/bin/helmfile \ + --set HELM_PLUGINS "${pluginsDir}" + '' + '' installShellCompletion --cmd helmfile \ --bash <($out/bin/helmfile completion bash) \ --fish <($out/bin/helmfile completion fish) \ diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index 722f0f6b73f..257b8e28a86 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.27.3+k3s1"; - k3sCommit = "fe9604cac119216e67f8bd5f14eb5608e3bcd3cf"; - k3sRepoSha256 = "09j940fcyg34ip04jjiwh5sv2l802jgvkpvlbnz4g6hdi7gipd8g"; - k3sVendorSha256 = "sha256-kodrl6fEsKPkxpOCfwzEONU2zhCHwg/xdyd+ajP26jc="; + k3sVersion = "1.27.4+k3s1"; + k3sCommit = "36645e7311e9bdbbf2adb79ecd8bd68556bc86f6"; + k3sRepoSha256 = "0nvh66c4c01kcz63vk2arh0cd9kcss7c83r92ds6f15x1fxv1w3z"; + k3sVendorSha256 = "sha256-azHl2jv/ioI7FVWpgtp7a1dmO9Dlr4CnRmGCIh5Biyg="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 44c977ab931..1cfa5865c3d 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.9"; + version = "0.3.13"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-nTGAYsw4R4ANAV8V3QdNpwXKWxdcAfXfUOUJJTkBD4k="; + hash = "sha256-JXKM39tODHg5jRE5p0u5xETPFDZrQgFri3FrYJFVUZU="; }; - vendorHash = "sha256-XHhk9JG9U4bz67pcNohAZJULIjmSPYBybYi3z6aPwi4="; + vendorHash = "sha256-L8/GLhjCI93R9S1fE+wgXyPObIXRMkj5MF71iWAZVQk="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index dc8c507670f..c2ddfda0641 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.30.0"; + version = "0.31.4"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-sIT5vqcKMZvx+6rvUzH3l7aOXMWJq81Lwl9YsGwE66w="; + hash = "sha256-1hjSuHGZ7NTsYLeV9Cw3wP5tUdAHRSmGlKkL54G/09U="; }; - vendorHash = "sha256-cJFAI/W5ImWcaU6cf/BFt78qES7wQtYnR863UvGP4aM="; + vendorHash = "sha256-0cpb5thhTJ7LPOYSd4WSPnS9OTXU608nk8xX5bsAm5w="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 06624f2b29f..76f81be00ea 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo="; + sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 650f5d5178c..554d0126ef7 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.2"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-pTy7uwPEUmeEQ/3oCeUr5544PRA+xXp5TCbzEuwY8mE="; + hash = "sha256-WlY9CdMY5fgEkXc/d/aUxr5c93oKd3vWQkUlX1jWaZo="; }; - vendorHash = "sha256-uEZY9erGZ19aNGSraD7Zdj8GTCRM247lYAhwqfMznpE="; + vendorHash = "sha256-vIIaiHciA7ZPW0GWJNL/wx0siiNfXK16jYjMkMDfywE="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 386327f9965..fe1b55bbe9b 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-d88IEbsk0bwC9Mzag3UOFVcSblCjaWXhKXC8iZr6V1s="; + sha256 = "sha256-C3anYYyhRT+/0jO01uEBX1LLQadovO+Z9JA6nHTNXOo="; }; vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0="; diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix index f77e8be5500..2686b79c4b7 100644 --- a/pkgs/applications/networking/cluster/nova/default.nix +++ b/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; - rev = version; - hash = "sha256-6gTrBogMvM7X6PFthG+c8N9wXoNHwp0wHjGVKjiHJJY="; + rev = "v${version}"; + hash = "sha256-K4D8vCZxOPRalSDlAmva7Qm72EJ2Xdz20oqKKqkD6iA="; }; - vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U="; + vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 93ed39d8c36..f0495f0201d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4=" }, "argocd": { - "hash": "sha256-S7Za9V18clq3Kb3pIQxUZpt8d51Dht76e+ypdAZB3VA=", + "hash": "sha256-pEcByit+xTBuJXCqhDOgHoc4lmCpbDptVocylcTqgz4=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.6.0", + "rev": "v6.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4gVJ5j2pdrtZYmatsO5N+IwVbNCJfqMlizDI7UhgiOU=" + "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "auth0": { "hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=", @@ -110,29 +110,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-6/KnfV4Gti79nh9Cpic1swfOjDkxRK1Zx57DLqTj/nE=", + "hash": "sha256-IIbSrtCm3GKJqfHstdczkptPLKHkNthtgzo0zORRPMQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.9.0", + "rev": "v5.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uBfZLiKLv60WoN+DXf6U62XnHxYt/jx2DRcWP58B6GA=" + "vendorHash": "sha256-UeXYx3AfUrWJB6o1qSrYqmnk6obJXnToyF0dHLhRfVQ=" }, "azuread": { - "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=", + "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.40.0", + "rev": "v2.41.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-7irC2P8Sev0lqUbJrHi6MjZGQ1ag0BDiQ84iEBVoDss=", + "hash": "sha256-Ff+9TpObtwCGn/xkb9YIQeXdKeX9c/jfps/XgvHk/Go=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.66.0", + "rev": "v3.67.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=", + "hash": "sha256-2nJXniJfOHuHaEEue0rugq5RRnThcFMh7MWYGE/AzmA=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.20.0", + "rev": "v0.21.2", "spdx": "MIT", - "vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I=" + "vendorHash": "sha256-xxuF4LVDkFkHT42plP+Mv8GFdBrrZZVUm6vErjpho3I=" }, "checkly": { "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=", @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-Zj8CC+Xiej+gz9V/9IeIGaWP2cjIg6jboXN5jrBCosM=", + "hash": "sha256-vC3uvv04an6KhXT1FECiB2LQMxJbiYhULNuiXoCRhnY=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.10.0", + "rev": "v4.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hxD+0OrCdyYn/9nvz5fd/54YiaZyZMOfsIa7lqZhCHE=" + "vendorHash": "sha256-m+tQeOUbJ+bnVYl4FcBSTHKYuSGtznCqRQ/CR204WkE=" }, "cloudfoundry": { "hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=", @@ -264,13 +264,13 @@ "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-UaTvFxwbLf9krUdsslFP6MXzpacnj/AKXiyUe7iSRCs=", + "hash": "sha256-2oujZd7tqvMnp48m3bs45p5dRC7U5a7hsiS5qBuPUHU=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-v1RHxXYTvpyWzyph6qg3GW75OPYc5qYQ/yyDI8WkbNc=" + "vendorHash": "sha256-0SRbKFKl1lfiiMDZW20ak9m09T3tSOH/fc+UwGeXmuk=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -354,13 +354,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-mS2o0AyOG2Z3tadv036we2J10S1JvNz3gdoykIjCSq0=", + "hash": "sha256-nqKswIq7cOEvGuoRA9Fv5j84Ob/z2C+Ux5ecdhTW0RY=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.14.3", + "rev": "v1.14.5", "spdx": "MIT", - "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" + "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc=" }, "exoscale": { "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", @@ -427,11 +427,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-xPxrHOuvOT8VO0D7M1TI39i0B1GIQ4Z2F1UckGsU/1A=", + "hash": "sha256-Y70HJEUArUCT1XM3F02bUNPwB1bW4N/Gg/M6aW7XcMM=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.31.0", + "rev": "v5.32.0", "spdx": "MIT", "vendorHash": null }, @@ -445,24 +445,24 @@ "vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0=" }, "google": { - "hash": "sha256-kv9DjEPFDeH2Cag2LAmn4GLbPkKXXij3nPRB2rpTizk=", + "hash": "sha256-kQF9ed2q5Wc/LTbFtzSKgcvJPZa18O6ybuT8dzLFdzc=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.74.0", + "rev": "v4.75.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-DZmpvDSAace2Rh/BMq49bUJK8g0FCaFebjTJvw3lW8A=" + "vendorHash": "sha256-2znSaprsw+uroTmLwh5+NXdgnUlkFXu4KbNLHgnGt2s=" }, "google-beta": { - "hash": "sha256-WZHKmSTF+SS6cqyqhW7Jer9vI79CkNb5CCkO/mjUOVE=", + "hash": "sha256-8Zt7q6OqtXGBk+wMBuBYZkfckFC3Gk/m+24Y8eelflw=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.74.0", + "rev": "v4.75.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-DZmpvDSAace2Rh/BMq49bUJK8g0FCaFebjTJvw3lW8A=" + "vendorHash": "sha256-2znSaprsw+uroTmLwh5+NXdgnUlkFXu4KbNLHgnGt2s=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -492,13 +492,13 @@ "vendorHash": null }, "hcloud": { - "hash": "sha256-gb5Mp9LI0wb+oA+lfkEmrVEIJzCRoAhugFfJaOkvLVw=", + "hash": "sha256-TbEbqTgzp7pUXrhjxvs5hrFI5u//xIIniOvusZsseiE=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.41.0", + "rev": "v1.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jEzCvhfQTK/1MCODUN4tNrtnNE0yR23QI5Vnx1kYr4E=" + "vendorHash": "sha256-wrgGxCNa5xLdBEy6RNNCz8ZVracyVsHzHtaQse6Ph+E=" }, "helm": { "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=", @@ -510,11 +510,11 @@ "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, "heroku": { - "hash": "sha256-zxX7cro1hAtgABlDsKQHxJJH9BrOlJHKFFwL5gGrmU0=", + "hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.2.4", + "rev": "v5.2.5", "spdx": null, "vendorHash": null }, @@ -655,11 +655,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-RNLWcABBoTDY541og/euj4CLhK6t58wck9rpdedwRJM=", + "hash": "sha256-I4d/REcXlyFX+LztvpkWjXjlWZD2JL//mewvgNdw2Rc=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.13.2", + "rev": "v2.13.3", "spdx": "MPL-2.0", "vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA=" }, @@ -736,13 +736,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-Xszx9eWLufT0Jky+Z9/rky3SLJsRk2gMDjuTFbPTkS8=", + "hash": "sha256-B/3hT/R5tdbJ8IYScCLSklDD8aRnmSgX48DeM3DGGOw=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.16.0", + "rev": "v1.17.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0=" + "vendorHash": "sha256-Pr5YNDMVNccjQRC5WXUY+0pMTMbuxKqkqtd/Z/z0cXc=" }, "mongodbatlas": { "hash": "sha256-lNWGGDGr0dp+4S1mnRnLl0n//5GtOqqSH4mWQxvzXEQ=", @@ -772,13 +772,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-cKwefGAx4VIdupCOb6XLQaiy+Na7XyFJ7yjZCiJO224=", + "hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.25.2", + "rev": "v3.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zp4gqpbJ6avIjV/cvomgqZsdk8XgweWQ6mIX4RlIo7c=" + "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" }, "nomad": { "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=", @@ -790,13 +790,13 @@ "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc=" }, "ns1": { - "hash": "sha256-8m9uj6s7oSaqKUv2kwbPmk7R3MsydWKVLMvcbXg945k=", + "hash": "sha256-faxvq99kkJS0rxNflmIhSDCO/VAVvPsIGV4MTgyRf+Y=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.4", + "rev": "v2.0.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-37mQ0/2a9nG3+WMvYgQofhhFw94OxSdnzez8RTgWSNU=" + "vendorHash": "sha256-FLQhshuqIcMeqrW6h68pXzPaY0VqRXhfL0YMpHyKfkY=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -818,11 +818,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-kGz6lginz3cZOYcfh21pBe+wAQ1slbsIz02sc1fNJ0E=", + "hash": "sha256-GH8y9NkoNydzEpwl6wxmHIpaq6IfRv8cOz/NidiT488=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -863,20 +863,20 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-SM6WG7igvFlIbi5AYj/1JXxjbpGgBkz2dKUnR4ZjQb8=", + "hash": "sha256-+goODpTThegmo2cew5bKxGhtqAHd2ObeEzSG2vxWK4w=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.3", + "rev": "v1.35.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-zlviJb2EYw/9NiD64xLFY8cd4H9Nb63tSbBUzFhW8Qo=" + "vendorHash": "sha256-VPQml9PAb/41wwLHAFtHDSwGLwPYG9ePiPgKhtfdt9Y=" }, "opsgenie": { - "hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=", + "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.28", + "rev": "v0.6.29", "spdx": "MPL-2.0", "vendorHash": null }, @@ -935,13 +935,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-hzcJOWbOh/HKYl9mKpo59/Mw2tjnfs36fQzSyFdKfFw=", + "hash": "sha256-/BAaOZM9SZA0crEEB0+UlCzDo2d4RfNdDQe04pCTCdE=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.0.2", + "rev": "v3.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc=" + "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" }, "random": { "hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=", @@ -1052,11 +1052,11 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-gScCKmDH8uavJass9Fg9pa6u/ZZfkHEhfBHlyyv3svE=", + "hash": "sha256-rxcpu3aQ5Ab6LmvQ4InN6/CNM1+44Z2Wmptg0Q9Kj2I=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.127.0", + "rev": "v1.130.0", "spdx": "MPL-2.0", "vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4=" }, @@ -1106,11 +1106,11 @@ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { - "hash": "sha256-uLMxL7Xk+Sa+/qFUWwFNSOVNrKwlno5S31NaY+iYjjc=", + "hash": "sha256-z2M3r3MNObSR2flqqldmZvTCiPJ6l+vr05a9Ks34t6U=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.16", + "rev": "v1.81.17", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1161,11 +1161,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", + "hash": "sha256-oG6Mme9Q4T/IgQF1jheL0SaV3NDCEGHvw5fbXIcgwPE=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.9.1", + "rev": "v1.10.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1252,13 +1252,13 @@ "vendorHash": null }, "wavefront": { - "hash": "sha256-RZUjMAwXFKpWqec7869EMB/My5EVpy7If5ZoJx7IzIg=", + "hash": "sha256-CNKXL02XRbgBIJa2JsusrgYoe0BacE9pnYwH+6Nmj84=", "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", "repo": "terraform-provider-wavefront", - "rev": "v3.6.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs=" + "vendorHash": "sha256-KrYtKeQsa2ApSt4QA2yxgWJHq8LpuAR+DYNB4tIsTZI=" }, "yandex": { "hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1aff80d275f..fe653013cf4 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,8 +166,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.3"; - hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo="; + version = "1.5.4"; + hash = "sha256-MvN4gSJcPORD0wj6ixc3gUXPISGvAKSJPA6bS/SmDOY="; vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 1ce1420ce3d..573e2cd78e4 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-D49jpwldmtS7/+++4avqAGOhILaHmlUvnfjoV45KVc4="; + hash = "sha256-1l+PEG3ptlWmM48v9K7Rm090WF8cv+e2ezYFN2JRK/o="; }; - vendorHash = "sha256-QWNYBHxcKyAexnD6bHfJIDSOEST2J/09YKC/kDsXKHU="; + vendorHash = "sha256-Mgo6Q3P8Piv5uLgyXDGpRI4CgbZn1DUcM7XhVZxl8EE="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix index 3107b31ac68..48035e203fd 100644 --- a/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sHk9ULh/792BEjPRcaeY3umx3pcLb41urrrouunm9nw="; + sha256 = "sha256-q19oKawv7hLHMaPAIIdGLl+4N+HiXuIow8f3k9bTt3A="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorSha256 = "sha256-Q9LjKgaFUx4txJlPcrG/YIbHV4hh5oWHVXIBDDgKYRg="; + vendorHash = "sha256-EV8MDHiQBmp/mEB+ug/yALPhcqytp0W8V6IPP+nt9DA="; subPackages = [ "cmd/gitops" ]; diff --git a/pkgs/applications/networking/cyberduck/default.nix b/pkgs/applications/networking/cyberduck/default.nix new file mode 100644 index 00000000000..2fb96644371 --- /dev/null +++ b/pkgs/applications/networking/cyberduck/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cyberduck"; + version = "8.6.0.39818"; + + src = fetchurl { + url = "https://update.cyberduck.io/Cyberduck-${finalAttrs.version}.zip"; + sha256 = "1iqq54n267lmmdlv8wmr9k461p49jindc1mn5wy742k08cqxc5ab"; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Libre file transfer client for Mac and Windows"; + homepage = "https://cyberduck.io"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d33a89f0bcc..73c068d5c56 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.7.10"; + version = "3.7.11"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-5wf1oQzriawhthAfHMMtZbUMvGNviBPzmnLKahRkmXQ="; + hash = "sha256-rrxY5liF4IzuaZ3kjJ2zEUzK1p7jGbS/T/bM1HQGzbA="; }; postPatch = '' diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix new file mode 100644 index 00000000000..5f2eb548791 --- /dev/null +++ b/pkgs/applications/networking/gnmic/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, buildPackages +}: + +buildGoModule rec { + pname = "gnmic"; + version = "0.31.3"; + + src = fetchFromGitHub { + owner = "openconfig"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+TxOl+at/SQIC1x/LwCgk4JmvOPY2el7HE1reAkmVn8="; + }; + + vendorHash = "sha256-4cmFoDMgD9TKacZ2RD73kQKDrpN5xuSKZ4ikcWAd5Rw="; + + ldflags = [ + "-s" "-w" + "-X" "github.com/openconfig/gnmic/app.version=${version}" + "-X" "github.com/openconfig/gnmic/app.commit=${src.rev}" + "-X" "github.com/openconfig/gnmic/app.date=1970-01-01T00:00:00Z" + ]; + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' + installShellCompletion --cmd gnmic \ + --bash <(${emulator} $out/bin/gnmic completion bash) \ + --fish <(${emulator} $out/bin/gnmic completion fish) \ + --zsh <(${emulator} $out/bin/gnmic completion zsh) + ''; + + meta = with lib; { + description = "gNMI CLI client and collector"; + homepage = "https://gnmic.openconfig.net/"; + changelog = "https://github.com/openconfig/gnmic/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ vincentbernat ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index f34cca6f929..83bf99b828d 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook gettext + gobject-introspection ]; buildInputs = [ qrencode - gobject-introspection glib glib-networking # required for TLS support libadwaita diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 53c6e7345e0..207ba682d27 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -82,6 +82,12 @@ dependencies = [ ] [[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -92,9 +98,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arrayref" @@ -221,6 +227,24 @@ dependencies = [ ] [[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "signal-hook", + "windows-sys 0.48.0", +] + +[[package]] name = "async-recursion" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -228,7 +252,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -271,7 +295,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -316,9 +340,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -352,7 +376,7 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -421,9 +445,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" @@ -485,9 +509,9 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" dependencies = [ "smallvec", "target-lexicon", @@ -526,12 +550,12 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", "winapi", @@ -567,16 +591,6 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "color_quant" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -675,16 +689,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] name = "ctr" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -716,50 +720,6 @@ dependencies = [ ] [[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -781,9 +741,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -792,33 +752,34 @@ dependencies = [ [[package]] name = "dirs" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -845,7 +806,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -922,11 +883,11 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.0", "rustc_version", ] @@ -938,7 +899,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.8.0" +version = "0.9.0" dependencies = [ "ashpd", "async-recursion", @@ -973,12 +934,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -1083,7 +1044,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1613,7 +1574,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1731,12 +1692,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -1794,9 +1754,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -1832,9 +1792,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -1894,15 +1854,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsignal-protocol" @@ -1935,7 +1895,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e871a#a2e871a3a28e615d70b0cdc50e9d8abc2867e535" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -1968,7 +1928,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e871a#a2e871a3a28e615d70b0cdc50e9d8abc2867e535" dependencies = [ "async-trait", "async-tungstenite", @@ -1992,15 +1952,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2008,9 +1959,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "locale_config" @@ -2037,11 +1988,10 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" dependencies = [ - "cfg-if", "value-bag", ] @@ -2107,6 +2057,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2130,15 +2089,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -2149,14 +2099,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2366,9 +2315,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "oncemutex" @@ -2388,7 +2337,7 @@ dependencies = [ "byteorder", "cbc", "cipher 0.4.4", - "digest 0.10.6", + "digest 0.10.7", "dirs", "futures-util", "hkdf 0.12.3", @@ -2417,6 +2366,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2500,7 +2455,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "hmac 0.12.1", "password-hash", "sha2 0.10.6", @@ -2512,7 +2467,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "hmac 0.12.1", ] @@ -2566,9 +2521,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" @@ -2580,7 +2535,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -2641,7 +2596,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage.git?rev=24af78c#24af78c499e4e7d1b0ac6788a98ecb3fb03ca80e" +source = "git+https://github.com/Schmiddiii/presage.git?rev=c1a246e1ac5181c34e83d9f838da154ca3160b5c#c1a246e1ac5181c34e83d9f838da154ca3160b5c" dependencies = [ "base64 0.12.3", "futures", @@ -2660,7 +2615,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage.git?rev=24af78c#24af78c499e4e7d1b0ac6788a98ecb3fb03ca80e" +source = "git+https://github.com/Schmiddiii/presage.git?rev=c1a246e1ac5181c34e83d9f838da154ca3160b5c#c1a246e1ac5181c34e83d9f838da154ca3160b5c" dependencies = [ "async-trait", "base64 0.12.3", @@ -2713,9 +2668,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -2856,9 +2811,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -2965,13 +2920,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.1", + "regex-syntax 0.7.2", ] [[package]] @@ -2994,9 +2949,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "ring" @@ -3024,9 +2979,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.13" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -3075,7 +3030,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", ] [[package]] @@ -3106,12 +3061,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3123,9 +3072,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -3136,9 +3085,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -3152,22 +3101,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -3189,14 +3138,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -3209,7 +3158,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3220,7 +3169,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3244,7 +3193,26 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "signal-hook" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", ] [[package]] @@ -3325,9 +3293,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -3348,9 +3316,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3361,9 +3329,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "temp-dir" @@ -3410,7 +3378,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -3430,9 +3398,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "libc", @@ -3441,7 +3409,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3456,13 +3424,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -3504,9 +3472,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] @@ -3545,20 +3513,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -3623,9 +3591,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -3643,12 +3611,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] name = "unicode-xid" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3696,22 +3658,18 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "uuid" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "serde", ] [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" [[package]] name = "version-compare" @@ -3755,9 +3713,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3765,24 +3723,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -3792,9 +3750,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3802,28 +3760,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -4069,15 +4027,16 @@ dependencies = [ [[package]] name = "zbus" -version = "3.12.0" +version = "3.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" dependencies = [ "async-broadcast", "async-executor", "async-fs", "async-io", "async-lock", + "async-process", "async-recursion", "async-task", "async-trait", @@ -4108,23 +4067,24 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.12.0" +version = "3.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "regex", "syn 1.0.109", + "winnow", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a" dependencies = [ "serde", "static_assertions", @@ -4148,7 +4108,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -4170,9 +4130,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c" dependencies = [ "byteorder", "enumflags2", @@ -4185,9 +4145,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4198,9 +4158,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index eeb397cd746..ef8630b7364 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -5,25 +5,28 @@ , meson , ninja , pkg-config +, gst_all_1 , protobuf , libsecret , libadwaita , rustPlatform , rustc +, appstream-glib +, blueprint-compiler , desktop-file-utils , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "flare"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "Schmiddiii"; repo = pname; rev = version; - hash = "sha256-w4WaWcUsjKiWfNe5StwRcPlcXqWz0427It96L1NsR0U="; + hash = "sha256-6p9uuK71fJvJs0U14jJEVb2mfpZWrCZZFE3eoZe9eVo="; }; cargoDeps = rustPlatform.importCargoLock { @@ -31,12 +34,14 @@ stdenv.mkDerivation rec { outputHashes = { "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; "libsignal-protocol-0.1.0" = "sha256-IBhmd3WzkICiADO24WLjDJ8pFILGwWNUHLXKpt+Y0IY="; - "libsignal-service-0.1.0" = "sha256-art5O06X4lhp9PoAd23mi6F1wRWkUcyON7AK8uBDoK8="; - "presage-0.6.0-dev" = "sha256-DVImXySYL0zlGkwss/5DnQ3skTaBa7l55VWIGCd6kQU="; + "libsignal-service-0.1.0" = "sha256-WSRqBNq9jbe6PSeExfmehNZwjlB70GLlHkrDlw59O5c="; + "presage-0.6.0-dev" = "sha256-oNDfFLir3XL2UOGrWR/IFO7XTeJKX+vjdrd3qbIomtw="; }; }; nativeBuildInputs = [ + appstream-glib # for appstream-util + blueprint-compiler desktop-file-utils # for update-desktop-database meson ninja @@ -51,6 +56,12 @@ stdenv.mkDerivation rec { libadwaita libsecret protobuf + + # To reproduce audio messages + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad ]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 4fc1a9d352e..3e6fa0d9249 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { format = "pyproject"; buildInputs = [ - gobject-introspection gtk3 gnome.adwaita-icon-theme + gtk3 gnome.adwaita-icon-theme gtksourceview4 glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ - gettext wrapGAppsHook + gettext wrapGAppsHook gobject-introspection ]; dontWrapGApps = true; diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index e71d5c020fe..df75f7192bf 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -23,10 +23,9 @@ buildGoModule rec { buildInputs = [ gtk4 glib - gobject-introspection ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; # Checking requires a working display doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index ffc2eea5b86..b34ed84d044 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -78,12 +78,11 @@ with mikutterPaths; stdenv.mkDerivation rec { sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; }; - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook ] + nativeBuildInputs = [ copyDesktopItems wrapGAppsHook gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ libicns ]; buildInputs = [ atk gtk2 - gobject-introspection libnotify which # some plugins use it at runtime wrappedRuby diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index b460527660d..2381b8d3e23 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230716"; + version = "20230723-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-k2QY+7mEXqvDzO0xv3XxQdhDje4iCPVOUybWnONLMTM="; + hash = "sha256-EHwQHFKahjpP8OOIY0ZRpkmYZYiDNteeMLkRwJIEp7g="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 4d8c1d4aee9..44846df1c74 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.32.122"; - x86_64-darwin-sha256 = "sha256-aKvMtuo3cNJsw42RNezmETsLAtl6G2yqYGOGp2Pt32U=3"; + x86_64-darwin-version = "4.33.73"; + x86_64-darwin-sha256 = "0y8plkl3pm8250xpavc91kn5b9gcdwr7bqzd3i79n48395lx11ka"; - x86_64-linux-version = "4.32.122"; - x86_64-linux-sha256 = "sha256-ViJHG7s7xqnatNOss5mfa7GqqlHbBrLGHBzTqqo7W/w="; + x86_64-linux-version = "4.33.73"; + x86_64-linux-sha256 = "007i8sjnm1ikjxvgw6nisj4nmv99bwk0r4sfpvc2j4w4wk68sx3m"; - aarch64-darwin-version = "4.32.122"; - aarch64-darwin-sha256 = "sha256-j3PbH/5cKN5+vUiLvXaxyPYilt6GX6FsGo+1hlJKrls="; + aarch64-darwin-version = "4.33.73"; + aarch64-darwin-sha256 = "15s3ss15yawb04dyzn82xmk1gs70sg2i3agsj2aw0xdx73yjl34p"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index caf0b45e602..792572e5c1c 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.2.4"; + version = "1.2.8"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-x5OYSU396FIgFbs4VchEpKI8Xv0mk2XPraejBgzWta0="; + hash = "sha256-5OocTsQjmNZCnzAY1RfrxD6Ad/kZTIkFl/3OmeJl1oI="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-HiNBXDQuPM8MnSkxYS5f+kop5QeUintNPBWtp6uhiz8="; + hash = "sha256-XUASMWrH8wWeYsr6gCdQGgV/7E6hLDWkJ0BXHZCepKQ="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 8735870e106..d4c5b18c5cd 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; - hash = "sha256-ZbElnFoQmXdtCR9lb6eOz4dMzSwpfjC1DvG3VbDoSEA="; + hash = "sha256-j4sgZ+tJpV6ST0yLmbLTLgBxQTcK1LZoEEfMe3TUAC4="; }; # grab the plugin sdk for the desktop icon diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix deleted file mode 100644 index c8e8598c140..00000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages -, makeWrapper, openssl, pkg-config, python3, readline, zlib -}: - -stdenv.mkDerivation rec { - pname = "telegram-cli"; - version = "20200106"; - - src = fetchFromGitHub { - owner = "kenorb-contrib"; - repo = "tg"; - rev = "refs/tags/${version}"; - sha256 = "sha256-wYBPr2b8IOycO9y/CNyGjnRsyGyYl3oiXYtTzwTurVA="; - fetchSubmodules = true; - }; - - patches = [ - # Pull patch pending upstream upstream inclusion for -fno-common toolchains: - # https://github.com/kenorb-contrib/tg/pull/61 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/kenorb-contrib/tg/commit/aad2e644fffa16066b227741d54de31bddb04ff8.patch"; - sha256 = "sha256-LAa5J4BVj3QCiDSs+p2bynDroMSIqCeexQvrgaDl6OE="; - }) - ]; - - buildInputs = [ - jansson - libconfig - libevent - libgcrypt - lua - lua53Packages.lgi - openssl - python3 - readline - zlib - ]; - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - installPhase = '' - runHook preInstall - install -Dm755 ./bin/telegram-cli $out/bin/telegram-cli-keyless - install -Dm644 ./tg-server.pub -t $out/share/telegram-cli - makeWrapper $out/bin/telegram-cli-keyless $out/bin/telegram-cli \ - --add-flags "-k $out/share/telegram-cli/tg-server.pub" - runHook postInstall - ''; - - meta = with lib; { - description = "Command-line interface for Telegram, that uses readline interface, it's a client implementation of TGL library"; - downloadPage = "https://github.com/kenorb-contrib/tg"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8834ba2a154..b7f46e13edf 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.3.20121"; - versions.x86_64-darwin = "5.15.3.20121"; - versions.x86_64-linux = "5.15.3.4839"; + versions.aarch64-darwin = "5.15.5.20753"; + versions.x86_64-darwin = "5.15.5.20753"; + versions.x86_64-linux = "5.15.5.5603"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-FEgLtKhjODZGuwzOWUK//TilXM3Gvka7B5E48eyrBuw="; + hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-q4//skfKwAuPqPxJedVACbSQQiTKmc8J24t7mCY6c/w="; + hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-4r1jayWHg+5Oerksj7DSc5xV15l7miA0a+CgPDUkpa0="; + hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg="; }; }; diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix new file mode 100644 index 00000000000..ed2817ed10a --- /dev/null +++ b/pkgs/applications/networking/localproxy/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, protobuf3_19 +, catch2 +, boost181 +, icu +}: +let + boost = boost181.override { enableStatic = true; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "localproxy"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "aws-samples"; + repo = "aws-iot-securetunneling-localproxy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl protobuf3_19 catch2 boost icu ]; + + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + + meta = with lib; { + description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; + homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; + license = licenses.asl20; + maintainers = with maintainers; [spalf]; + platforms = platforms.unix; + }; + }) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 33afc845092..6ce0abb6c0e 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.7.3"; + version = "1.8.0"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-IzE+rCudMskJuPIWsz+u2D5KC8mc1JhNDVSHXixUEZA="; + hash = "sha256-Ys7XrvV4qzq4Q9llua2WgU013Ui0+x+uMwLNIv6xxCw="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 47c448c9b32..4f6b3015cf3 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -41,13 +41,13 @@ python3Packages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gobject-introspection libsecret ] ++ pluginsDeps; nativeBuildInputs = [ gettext wrapGAppsHook + gobject-introspection # To later add plugins to xorg.lndir ]; diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix index 1def97bd62d..bb758565eb8 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix @@ -16,8 +16,11 @@ python3Packages.buildPythonPackage rec { sha256 = "0bij6cy96nhq7xzslx0fnhmiac629h0x4wgy67k4i4npwqw10680"; }; - buildInputs = [ + nativeBuildInputs = [ gobject-introspection + ]; + + buildInputs = [ gnome-online-accounts ]; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 6bb9e653ab7..f5a2139b532 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.113.3"; + version = "3.115.2"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-d4yvz0BE0YeZjcH9X/2eGAk5CmJI4CQWblVoU5CO77k="; + sha256 = "sha256-PdVvrb+sC8LF4tZXAHt2CevyoXhxTXJB01Fe64YI6BI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 68e2bec7ccc..bca6c566b74 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { python3Packages.wrapPython intltool pkg-config + gobject-introspection ]; buildInputs = [ @@ -49,7 +50,6 @@ stdenv.mkDerivation rec { libpeas gsettings-desktop-schemas json-glib - gobject-introspection libsecret glib-networking libnotify diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 854f1c3484e..839766e2ac7 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,11 +1,12 @@ { spellChecking ? true , lib , stdenv -, fetchurl +, fetchFromGitLab +, autoreconfHook , pkg-config , gtk3 , gtkspell3 -, gmime2 +, gmime3 , gettext , intltool , itstool @@ -21,21 +22,19 @@ stdenv.mkDerivation rec { pname = "pan"; - version = "0.146"; - - src = fetchurl { - url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; + version = "0.154"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "v${version}"; + hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ="; }; - patches = [ - # Take <glib.h>, <gmime.h>, "gtk-compat.h" out of extern "C" - ./move-out-of-extern-c.diff - ]; - - nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ]; - buildInputs = [ gtk3 gmime2 libnotify gnutls ] + buildInputs = [ gtk3 gmime3 libnotify gnutls ] ++ lib.optional spellChecking gtkspell3 ++ lib.optionals gnomeSupport [ libsecret gcr ]; diff --git a/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff b/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff deleted file mode 100644 index 02b19b58ee5..00000000000 --- a/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff +++ /dev/null @@ -1,1113 +0,0 @@ -diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc -index b06d0c2..f424738 100644 ---- a/pan/data-impl/article-filter.cc -+++ b/pan/data-impl/article-filter.cc -@@ -25,10 +25,7 @@ - #include <gmime/gmime.h> - - //#include <glib/gprintf.h> --extern "C" --{ -- #include <glib.h> --} -+#include <glib.h> - - #include "article-filter.h" - -diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc -index 88012cc..4465966 100644 ---- a/pan/data-impl/data-impl.cc -+++ b/pan/data-impl/data-impl.cc -@@ -22,10 +22,8 @@ - **************/ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include <glib.h> // for g_build_filename --} -+#include <glib/gi18n.h> -+#include <glib.h> // for g_build_filename - #include <pan/general/debug.h> - #include <pan/general/file-util.h> - #include <pan/general/log.h> -diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc -index bea1a90..d938634 100644 ---- a/pan/data-impl/data-io.cc -+++ b/pan/data-impl/data-io.cc -@@ -27,9 +27,9 @@ extern "C" { - #include <sys/types.h> // for chmod - #include <sys/stat.h> // for chmod - #include <unistd.h> -- #include <glib.h> -- #include <glib/gi18n.h> - } -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> - #include <pan/general/line-reader.h> -diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc -index 244feb9..da0183a 100644 ---- a/pan/data-impl/groups.cc -+++ b/pan/data-impl/groups.cc -@@ -29,9 +29,9 @@ - #include <vector> - - #include <glib.h> -+#include <glib/gi18n.h> - extern "C" { - #include <unistd.h> -- #include <glib/gi18n.h> - } - - #include <pan/general/debug.h> -diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc -index f8c4466..16d5672 100644 ---- a/pan/data-impl/headers.cc -+++ b/pan/data-impl/headers.cc -@@ -25,10 +25,10 @@ - #include <string> - #include <cmath> - #include <glib.h> -+#include <glib/gi18n.h> - extern "C" { - #include <sys/types.h> // for chmod - #include <sys/stat.h> // for chmod -- #include <glib/gi18n.h> - } - #include <pan/general/debug.h> - #include <pan/general/log.h> -diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc -index e999fda..a6e6bb5 100644 ---- a/pan/data-impl/profiles.cc -+++ b/pan/data-impl/profiles.cc -@@ -26,9 +26,9 @@ - extern "C" { - #include <sys/types.h> // for chmod - #include <sys/stat.h> // for chmod -- #include <glib.h> -- #include <glib/gi18n.h> - } -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/string-view.h> - #include <pan/general/file-util.h> -diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc -index 9ea55d4..b23782f 100644 ---- a/pan/data-impl/server.cc -+++ b/pan/data-impl/server.cc -@@ -25,10 +25,8 @@ - #include <map> - #include <set> - #include <vector> --extern "C" { -- #include <glib.h> // for GMarkup -- #include <glib/gi18n.h> --} -+#include <glib.h> // for GMarkup -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> - #include <pan/general/log.h> -diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc -index ff8644f..a199556 100644 ---- a/pan/data-impl/xover.cc -+++ b/pan/data-impl/xover.cc -@@ -20,10 +20,8 @@ - #include <config.h> - #include <cmath> - #include <fstream> --extern "C" { -- #include <glib/gi18n.h> -- #include <gmime/gmime.h> --} -+#include <glib/gi18n.h> -+#include <gmime/gmime.h> - #include <pan/general/debug.h> - #include <pan/general/log.h> - #include <pan/general/macros.h> -diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc -index 1855153..30fa0f9 100644 ---- a/pan/data/article-cache.cc -+++ b/pan/data/article-cache.cc -@@ -26,11 +26,10 @@ extern "C" - #include <sys/stat.h> - #include <unistd.h> - #include <dirent.h> -- -- #include <glib.h> -- #include <glib/gi18n.h> -- #include <gmime/gmime.h> - } -+#include <glib.h> -+#include <gmime/gmime.h> -+#include <glib/gi18n.h> - - #include <pan/general/debug.h> - #include <pan/general/file-util.h> -diff --git a/pan/data/article-cache.h b/pan/data/article-cache.h -index 2ac722b..1304bfe 100644 ---- a/pan/data/article-cache.h -+++ b/pan/data/article-cache.h -@@ -22,9 +22,7 @@ - - #include <map> - #include <vector> --extern "C" { -- #include <glib.h> // for guint64 --} -+#include <glib.h> // for guint64 - #include <pan/general/string-view.h> - #include <pan/general/quark.h> - -diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc -index 340fc8b..f6cd46e 100644 ---- a/pan/data/cert-store.cc -+++ b/pan/data/cert-store.cc -@@ -34,10 +34,8 @@ - #include <iostream> - #include <string> - --extern "C" { - #include <glib/gi18n.h> - #include <glib.h> --} - - #include <pan/general/debug.h> - #include <pan/general/e-util.h> -diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc -index 3a82ea9..61c67a2 100644 ---- a/pan/data/encode-cache.cc -+++ b/pan/data/encode-cache.cc -@@ -28,11 +28,10 @@ extern "C" - #include <sys/stat.h> - #include <unistd.h> - #include <dirent.h> -- -- #include <glib.h> -- #include <glib/gi18n.h> -- #include <gmime/gmime.h> - } -+#include <gmime/gmime.h> -+#include <glib.h> -+#include <glib/gi18n.h> - - #include <pan/general/debug.h> - #include <pan/general/file-util.h> -diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h -index 8bbd530..1affc0c 100644 ---- a/pan/data/encode-cache.h -+++ b/pan/data/encode-cache.h -@@ -22,9 +22,7 @@ - - #include <map> - #include <vector> --extern "C" { -- #include <glib.h> // for guint64 --} -+#include <glib.h> // for guint64 - #include <pan/general/string-view.h> - #include <pan/general/quark.h> - -diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc -index af5ccd0..62879ee 100644 ---- a/pan/general/e-util.cc -+++ b/pan/general/e-util.cc -@@ -26,9 +26,9 @@ - #include <ctime> - extern "C" { - #include <ctype.h> -- #include <glib.h> -- #include <glib/gi18n.h> - } -+#include <glib.h> -+#include <glib/gi18n.h> - #include "debug.h" - #include "e-util.h" - -diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc -index 02e9ed1..9efa269 100644 ---- a/pan/general/file-util.cc -+++ b/pan/general/file-util.cc -@@ -27,12 +27,12 @@ extern "C" - #include <unistd.h> - #include <sys/stat.h> - #include <sys/types.h> -- #include <glib.h> -- #include <glib/gi18n.h> - #ifndef G_OS_WIN32 - #include <pwd.h> - #endif - } -+#include <glib.h> -+#include <glib/gi18n.h> - - #include "debug.h" - #include "log.h" -diff --git a/pan/general/file-util.h b/pan/general/file-util.h -index c125c8d..8c67639 100644 ---- a/pan/general/file-util.h -+++ b/pan/general/file-util.h -@@ -25,9 +25,9 @@ - extern "C" { - #include <stddef.h> - #include <stdio.h> -- #include <glib.h> -- #include <glib/gstdio.h> - } -+#include <glib.h> -+#include <glib/gstdio.h> - #include <pan/general/string-view.h> - - #define g_freopen freopen -diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc -index afb9be8..6b80fc4 100644 ---- a/pan/general/line-reader.cc -+++ b/pan/general/line-reader.cc -@@ -1,9 +1,7 @@ - #include <config.h> - #include <cstdio> - #include <cstdlib> --extern "C"{ -- #include <glib/gi18n.h> --} -+#include <glib/gi18n.h> - #include <cerrno> - #include "file-util.h" - #include "line-reader.h" -diff --git a/pan/general/macros.h b/pan/general/macros.h -index 6dcf908..b16230f 100644 ---- a/pan/general/macros.h -+++ b/pan/general/macros.h -@@ -63,9 +63,6 @@ - *** g_assert - **/ - --extern "C" --{ -- #include <glib.h> --} -+#include <glib.h> - - #endif -diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc -index fcacbe2..d390de0 100644 ---- a/pan/general/text-match.cc -+++ b/pan/general/text-match.cc -@@ -20,9 +20,9 @@ - #include <config.h> - extern "C" { - #include <ctype.h> -- #include <glib.h> -- #include <glib/gi18n.h> - } -+#include <glib.h> -+#include <glib/gi18n.h> - #include "debug.h" - #include "log.h" - #include "text-match.h" -diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc -index be79a13..fea6100 100644 ---- a/pan/general/utf8-utils.cc -+++ b/pan/general/utf8-utils.cc -@@ -21,9 +21,7 @@ - #include <string> - #include <vector> - #include <string.h> --extern "C" { - #include <glib/gi18n.h> --} - #include <locale.h> - #include <gmime/gmime.h> - #include <pan/general/debug.h> -diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc -index 520c08b..5ec397c 100644 ---- a/pan/gui/actions.cc -+++ b/pan/gui/actions.cc -@@ -18,11 +18,9 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" - -+#include <glib/gi18n.h> - #include <pan/general/macros.h> - #include <pan/general/debug.h> - #include <pan/data-impl/data-impl.h> -diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc -index 53e9124..e9841e2 100644 ---- a/pan/gui/body-pane.cc -+++ b/pan/gui/body-pane.cc -@@ -22,11 +22,9 @@ - #include <cmath> - #include <iostream> - #include <sstream> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" -- #include <gmime/gmime.h> --} -+#include "gtk-compat.h" -+#include <gmime/gmime.h> -+#include <glib/gi18n.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <pan/general/debug.h> - #include <pan/general/log.h> -diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc -index 5841651..e9f4b2d 100644 ---- a/pan/gui/dl-headers-ui.cc -+++ b/pan/gui/dl-headers-ui.cc -@@ -18,11 +18,9 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include <glib.h> -+#include <glib/gi18n.h> -+#include "gtk-compat.h" - #include <pan/general/macros.h> - #include <pan/tasks/queue.h> - #include <pan/tasks/task-xover.h> -diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc -index 28ad581..3ff103e 100644 ---- a/pan/gui/group-pane.cc -+++ b/pan/gui/group-pane.cc -@@ -20,10 +20,8 @@ - #include <config.h> - #include <cassert> - #include <deque> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - //#include <pan/general/gdk-threads.h> - #include <pan/general/log.h> -diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc -index 677b07a..0d7df8b 100644 ---- a/pan/gui/group-prefs-dialog.cc -+++ b/pan/gui/group-prefs-dialog.cc -@@ -18,14 +18,14 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include <glib.h> -- #include "gtk-compat.h" -+#include <glib/gi18n.h> -+#include <glib.h> - #ifdef HAVE_GTKSPELL -+extern "C" { - #include <enchant/enchant.h> --#endif - } -+#endif -+#include "gtk-compat.h" - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/data/data.h> -diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc -index 3e9851b..b06a949 100644 ---- a/pan/gui/group-prefs.cc -+++ b/pan/gui/group-prefs.cc -@@ -21,8 +21,8 @@ extern "C" { - #include <config.h> - #include <sys/types.h> // chmod - #include <sys/stat.h> // chmod -- #include <glib.h> - } -+#include <glib.h> - #include <iostream> - #include <fstream> - #include <pan/general/file-util.h> -diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc -index f79aa1e..9f8787e 100644 ---- a/pan/gui/gui.cc -+++ b/pan/gui/gui.cc -@@ -25,9 +25,9 @@ - extern "C" { - #include <sys/types.h> // for chmod - #include <sys/stat.h> // for chmod -- #include <glib/gi18n.h> - #include <dirent.h> - } -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/e-util.h> - #include <pan/general/file-util.h> -diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc -index dc65a77..a4a9952 100644 ---- a/pan/gui/header-pane.cc -+++ b/pan/gui/header-pane.cc -@@ -19,10 +19,9 @@ - - extern "C" { - #include <config.h> -- #include <glib/gi18n.h> -- #include "gtk-compat.h" -- #include "gtk-compat.h" - } -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <cctype> - #include <cmath> - #include <algorithm> -diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc -index 7b11493..b204298 100644 ---- a/pan/gui/log-ui.cc -+++ b/pan/gui/log-ui.cc -@@ -21,10 +21,8 @@ - #include <ostream> - #include <fstream> - #include <iostream> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/log.h> - #include <pan/general/macros.h> - #include <pan/general/string-view.h> -diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc -index 705fc91..c67acf8 100644 ---- a/pan/gui/pan-file-entry.cc -+++ b/pan/gui/pan-file-entry.cc -@@ -19,10 +19,8 @@ - - #include <config.h> - #include <string> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/file-util.h> - #include "pad.h" - #include "pan-file-entry.h" -diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc -index fb3a696..46c1a5d 100644 ---- a/pan/gui/pan.cc -+++ b/pan/gui/pan.cc -@@ -24,9 +24,6 @@ - #include <signal.h> - - extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" -- #include <gmime/gmime.h> - #include <gio/gio.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -34,6 +31,9 @@ extern "C" { - #include <uulib/crc32.h> - } - -+#include "gtk-compat.h" -+#include <glib/gi18n.h> -+#include <gmime/gmime.h> - #ifdef G_OS_WIN32 - #undef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 -diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc -index 8769ec5..92c757d 100644 ---- a/pan/gui/post-ui.cc -+++ b/pan/gui/post-ui.cc -@@ -23,14 +23,14 @@ - #include <sstream> - #include <unistd.h> - extern "C" { -- #include <gmime/gmime.h> -- #include <glib/gi18n.h> -- #include "gtk-compat.h" - #include <sys/time.h> - #ifdef HAVE_GTKSPELL - #include <gtkspell/gtkspell.h> - #endif - } -+#include "gtk-compat.h" -+#include <gmime/gmime.h> -+#include <glib/gi18n.h> - #include <pan/data/data.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> -diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc -index bde7ef3..64c540f 100644 ---- a/pan/gui/prefs-file.cc -+++ b/pan/gui/prefs-file.cc -@@ -24,8 +24,8 @@ - extern "C" { - #include <sys/types.h> // for chmod - #include <sys/stat.h> // for chmod -- #include <glib.h> - } -+#include <glib.h> - #include <pan/general/file-util.h> - #include "prefs-file.h" - -diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc -index f7dc0f0..aac9ec1 100644 ---- a/pan/gui/prefs-ui.cc -+++ b/pan/gui/prefs-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/general/file-util.h> -diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc -index fdbd908..64dd8da 100644 ---- a/pan/gui/prefs.cc -+++ b/pan/gui/prefs.cc -@@ -23,10 +23,8 @@ - #include <iostream> - #include <sstream> - #include <string> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> --} -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/log.h> - #include <pan/general/macros.h> -diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc -index 26ff029..cf8bd44 100644 ---- a/pan/gui/profiles-dialog.cc -+++ b/pan/gui/profiles-dialog.cc -@@ -23,10 +23,8 @@ - - #include <config.h> - #include <iostream> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/usenet-utils/gnksa.h> -diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc -index 241ad1c..43ef4f2 100644 ---- a/pan/gui/progress-view.cc -+++ b/pan/gui/progress-view.cc -@@ -18,9 +18,7 @@ - */ - - #include <config.h> --extern "C" { -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" - #include <pan/general/string-view.h> - #include <pan/usenet-utils/mime-utils.h> - #include "progress-view.h" -diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc -index 0b08b6f..0e86a1b 100644 ---- a/pan/gui/save-attach-ui.cc -+++ b/pan/gui/save-attach-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/icons/pan-pixbufs.h> -diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc -index 0f034e5..1df0cfb 100644 ---- a/pan/gui/save-ui.cc -+++ b/pan/gui/save-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/icons/pan-pixbufs.h> -diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc -index e72bdb5..3b81167 100644 ---- a/pan/gui/score-add-ui.cc -+++ b/pan/gui/score-add-ui.cc -@@ -20,9 +20,7 @@ - #include <config.h> - #include <cassert> - #include <climits> --extern "C" { -- #include <glib/gi18n.h> --} -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/text-match.h> - #include "hig.h" -diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc -index d6c81c1..1327426 100644 ---- a/pan/gui/score-view-ui.cc -+++ b/pan/gui/score-view-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include "pad.h" - #include "score-add-ui.h" -diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc -index b42bc18..268114b 100644 ---- a/pan/gui/server-ui.cc -+++ b/pan/gui/server-ui.cc -@@ -21,11 +21,9 @@ - #include <cstdlib> - #include <cstring> - #include <climits> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include <glib.h> -+#include <glib/gi18n.h> -+#include "gtk-compat.h" - - #include <pan/icons/pan-pixbufs.h> - #include <pan/general/file-util.h> -diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc -index 4f77922..18a8f74 100644 ---- a/pan/gui/task-pane.cc -+++ b/pan/gui/task-pane.cc -@@ -18,11 +18,9 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> -- #include "gtk-compat.h" --} -+#include <glib.h> -+#include <glib/gi18n.h> -+#include "gtk-compat.h" - #include <pan/general/e-util.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> -diff --git a/pan/gui/url.cc b/pan/gui/url.cc -index e1173ae..94ffb52 100644 ---- a/pan/gui/url.cc -+++ b/pan/gui/url.cc -@@ -20,10 +20,8 @@ - #include <config.h> - #include <iostream> - #include <string> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> --}; -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/log.h> - #include "url.h" - -diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc -index b4c21ae..f8cb6db 100644 ---- a/pan/tasks/decoder.cc -+++ b/pan/tasks/decoder.cc -@@ -28,8 +28,8 @@ - extern "C" { - # define PROTOTYPES - # include <uulib/uudeview.h> --# include <glib/gi18n.h> - }; -+#include <glib/gi18n.h> - #include <pan/general/worker-pool.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> -diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc -index 7960b84..5989059 100644 ---- a/pan/tasks/encoder.cc -+++ b/pan/tasks/encoder.cc -@@ -31,10 +31,10 @@ - extern "C" { - #define PROTOTYPES - #include <uulib/uudeview.h> --#include <glib/gi18n.h> - #include <sys/time.h> - }; - -+#include <glib/gi18n.h> - #include <pan/general/worker-pool.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> -diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc -index ceb1574..71c5cf1 100644 ---- a/pan/tasks/nntp.cc -+++ b/pan/tasks/nntp.cc -@@ -22,10 +22,8 @@ - #include <cstdarg> - #include <cstdlib> // abort, atoi, strtoul - #include <cstdio> // snprintf --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> --} -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/log.h> - #include <pan/general/messages.h> -diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc -index af890e5..14df6f6 100644 ---- a/pan/tasks/nzb.cc -+++ b/pan/tasks/nzb.cc -@@ -24,9 +24,7 @@ - #include <sstream> - #include <string> - #include <map> --extern "C" { -- #include <glib.h> --} -+#include <glib.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> - #include <pan/general/log.h> -diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc -index d3339dd..7dc2ec1 100644 ---- a/pan/tasks/socket-impl-gio.cc -+++ b/pan/tasks/socket-impl-gio.cc -@@ -31,9 +31,9 @@ - - extern "C" { - #include <unistd.h> -- #include <glib/gi18n.h> - } - -+#include <glib/gi18n.h> - #include <pan/general/file-util.h> - #include <pan/general/log.h> - #include <pan/general/macros.h> -diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc -index c33edfd..688183c 100644 ---- a/pan/tasks/socket-impl-main.cc -+++ b/pan/tasks/socket-impl-main.cc -@@ -30,10 +30,7 @@ - //#include <glib/giochannel.h> - //#include <glib/gstring.h> - --extern "C" --{ -- #include <glib.h> --} -+#include <glib.h> - - #include <pan/tasks/socket.h> - -diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc -index b58e074..5b1b0b0 100644 ---- a/pan/tasks/socket-impl-openssl.cc -+++ b/pan/tasks/socket-impl-openssl.cc -@@ -34,13 +34,14 @@ - - extern "C" { - #include <unistd.h> -- #include <glib/gi18n.h> - #include <errno.h> - #include <fcntl.h> - #include <sys/time.h> - #include <sys/types.h> - } - -+#include <glib/gi18n.h> -+ - #include <pan/usenet-utils/ssl-utils.h> - #include <pan/general/file-util.h> - #include <pan/general/log.h> -diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h -index e48cbae..eea41d4 100644 ---- a/pan/tasks/socket-impl-openssl.h -+++ b/pan/tasks/socket-impl-openssl.h -@@ -27,10 +27,7 @@ - #include <string> - //#include <glib/giochannel.h> - //#include <glib/gstring.h> --extern "C" --{ -- #include <glib.h> --} -+#include <glib.h> - - #include <pan/general/debug.h> - #include <pan/general/quark.h> -diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc -index 78d53fb..2c7a28d 100644 ---- a/pan/tasks/socket.cc -+++ b/pan/tasks/socket.cc -@@ -21,9 +21,7 @@ - #include <cstdarg> - #include <ctime> - #include <cmath> --extern "C" { -- #include <glib.h> --} -+#include <glib.h> - #include <pan/general/debug.h> - #include <pan/general/string-view.h> - #include "socket.h" -diff --git a/pan/tasks/task-article.cc b/pan/tasks/task-article.cc -index 9c96b7d..1dc17ba 100644 ---- a/pan/tasks/task-article.cc -+++ b/pan/tasks/task-article.cc -@@ -24,10 +24,7 @@ - #include <config.h> - #include <algorithm> - #include <cassert> --extern "C" --{ -- #include <glib/gi18n.h> --} -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/file-util.h> - #include <pan/general/utf8-utils.h> -diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc -index b8618d6..9b72369 100644 ---- a/pan/tasks/task-groups.cc -+++ b/pan/tasks/task-groups.cc -@@ -20,9 +20,9 @@ - #include <config.h> - #include <cassert> - extern "C" { -- #include <glib/gi18n.h> - #include <stdlib.h> - } -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/general/messages.h> -diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc -index bb80fb9..4ab9c2f 100644 ---- a/pan/tasks/task-post.cc -+++ b/pan/tasks/task-post.cc -@@ -18,9 +18,7 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib/gi18n.h> --} -+#include <glib/gi18n.h> - #include "task-post.h" - #include <pan/general/debug.h> - #include <pan/general/log.h> -diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h -index 7bd4fe0..e5377c6 100644 ---- a/pan/tasks/task-upload.h -+++ b/pan/tasks/task-upload.h -@@ -37,10 +37,10 @@ - extern "C" { - #define PROTOTYPES - #include <uulib/uudeview.h> -- #include <gmime/gmime.h> -- #include <glib/gi18n.h> - }; - -+#include <gmime/gmime.h> -+#include <glib/gi18n.h> - #include <set> - - namespace pan -diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc -index c3c8260..64b41a4 100644 ---- a/pan/tasks/task-xover.cc -+++ b/pan/tasks/task-xover.cc -@@ -26,10 +26,10 @@ extern "C" - #define PROTOTYPES - #include <stdio.h> - #include <uulib/uudeview.h> --#include <glib/gi18n.h> --#include <gmime/gmime-utils.h> - } - -+#include <gmime/gmime-utils.h> -+#include <glib/gi18n.h> - #include <fstream> - #include <iostream> - #include <pan/general/debug.h> -diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc -index c598bf8..9a9e488 100644 ---- a/pan/tasks/task-xoverinfo.cc -+++ b/pan/tasks/task-xoverinfo.cc -@@ -24,10 +24,10 @@ extern "C" { - #define PROTOTYPES - #include <stdio.h> - #include <uulib/uudeview.h> -- #include <glib/gi18n.h> -- #include <gmime/gmime-utils.h> - #include <zlib.h> - } -+#include <glib/gi18n.h> -+#include <gmime/gmime-utils.h> - #include <fstream> - #include <iostream> - #include <pan/general/debug.h> -diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc -index f464428..6b1a5c9 100644 ---- a/pan/usenet-utils/filter-info.cc -+++ b/pan/usenet-utils/filter-info.cc -@@ -18,10 +18,8 @@ - */ - - #include <config.h> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> --} -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/macros.h> - #include "filter-info.h" - -diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc -index db1f2c4..fb888d5 100644 ---- a/pan/usenet-utils/gnksa.cc -+++ b/pan/usenet-utils/gnksa.cc -@@ -37,10 +37,10 @@ extern "C" - { - #include <ctype.h> - #include <unistd.h> -- #include <glib/gi18n.h> - #include <sys/time.h> - } - -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/general/log.h> -diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc -index 4df4525..8755777 100644 ---- a/pan/usenet-utils/gpg.cc -+++ b/pan/usenet-utils/gpg.cc -@@ -28,9 +28,9 @@ extern "C" { - #include <stdlib.h> - #include <unistd.h> - #include <string.h> -- #include <glib/gi18n.h> -- #include <gmime/gmime.h> - } -+#include <glib/gi18n.h> -+#include <gmime/gmime.h> - - #ifdef HAVE_GMIME_CRYPTO - -diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc -index a511556..461ce86 100644 ---- a/pan/usenet-utils/message-check.cc -+++ b/pan/usenet-utils/message-check.cc -@@ -21,9 +21,7 @@ - #include <ctype.h> - #include <string.h> - #include <glib.h> --extern "C" { - #include <glib/gi18n.h> --} - #include <pan/general/debug.h> - #include <pan/general/macros.h> - #include <pan/general/string-view.h> -diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc -index 1c03adc..91e78be 100644 ---- a/pan/usenet-utils/rules-info.cc -+++ b/pan/usenet-utils/rules-info.cc -@@ -22,10 +22,8 @@ - - - #include <config.h> --extern "C" { -- #include <glib.h> -- #include <glib/gi18n.h> --} -+#include <glib.h> -+#include <glib/gi18n.h> - #include <pan/general/macros.h> - #include "rules-info.h" - -diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc -index 8b56a2a..4b151f0 100644 ---- a/pan/usenet-utils/scorefile.cc -+++ b/pan/usenet-utils/scorefile.cc -@@ -23,9 +23,7 @@ - #include <iostream> - #include <sstream> - #include <string> --extern "C" { -- #include <glib/gi18n.h> --} -+#include <glib/gi18n.h> - #include <pan/general/debug.h> - #include <pan/general/log.h> - #include <pan/general/macros.h> -diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h -index 2286250..0beb32f 100644 ---- a/pan/usenet-utils/ssl-utils.h -+++ b/pan/usenet-utils/ssl-utils.h -@@ -43,9 +43,7 @@ - #include <map> - #include <sstream> - #include <iostream> --extern "C" { -- #include <glib/gi18n.h> --} -+#include <glib/gi18n.h> - - namespace pan - { -diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc -index 4fcd8d5..15a818b 100644 ---- a/pan/usenet-utils/text-massager.cc -+++ b/pan/usenet-utils/text-massager.cc -@@ -22,9 +22,7 @@ - #include <map> - #include <cstring> - #include <glib.h> --extern "C" { - #include <glib/gi18n.h> --} - #include "text-massager.h" - #include <pan/general/log.h> - #include <pan/general/e-util.h> diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 820bfa8b4ef..11831c24b4d 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,7 +4,6 @@ , cmake , extra-cmake-modules , inotify-tools -, installShellFiles , libcloudproviders , librsvg , libsecret @@ -26,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.9.0"; + version = "3.9.1"; outputs = [ "out" "dev" ]; @@ -34,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-XcQYttd5dl2TCbBxOlRBg8/mEiHekoxayPi81ot7N7o="; + sha256 = "sha256-DQM7n7rTk1q+F8H8OpiEgg1pvIzQw2UwBObbj20O5MQ="; }; patches = [ diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index e1a2a382644..c8ac75683ae 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,29 +6,33 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.8.1"; + version = "0.7.10"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-+wZiwUy5bmW8+3h4SuvNN8I6mCIPOlOeFmiXlMu12OU="; + sha256 = "sha256-ZQYdK0B0z0cXTx7ujFngW3wSa/j8sEuwHB+BC5Xqq8o="; }; propagatedBuildInputs = with python3Packages; [ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml - pyaes + pyaes coincurve ]; buildPhase = '' + runHook preBuild ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share cp -r plugins src *.py $out/share/ + runHook postInstall ''; postFixup = '' diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 91e6fb58f49..e6e97bd0abe 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildGoModule , testers , seaweedfs @@ -8,26 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.54"; + version = "3.55"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-2E2ANJIKWhUUxxSqk5+QROeoKnp1Akl5Bp+i8pPTkuQ="; + hash = "sha256-qAyvGisj6GOjyRmqpTsxX/Zy8bx6+cAtmEId5us70+k="; }; - patches = [ - # Fix build on aarch64-darwin - # (remove again when v3.55 is released) - # https://github.com/seaweedfs/seaweedfs/pull/4679 - (fetchpatch { - url = "https://github.com/seaweedfs/seaweedfs/commit/1bfc9581e0bc04f394187a0d39f319ad65df5aca.patch"; - hash = "sha256-znQFtm8BYAjuvXa+vibawBb+uhnjOL9/o0sXNoXwLk8="; - }) - ]; - - vendorHash = "sha256-VK7BmApGq+X1oNjcwCSYHcEvVjL87t8fgJXLNQSfy3I="; + vendorHash = "sha256-F6Fqv5tUsty/uGwBnKM4r671Gh2T1+9Z2LRGAMF+M2g="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index c62893938bf..cd72539f77c 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "1.0.60"; + version = "1.0.83+88994"; src = fetchurl { - url = "https://binaries.twingate.com/client/linux/DEB/${version}/twingate-amd64.deb"; - sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678"; + url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; + hash = "sha256-rPYjGSrjSNSdjMZRP0Gd7a9lRC+I06oOvZZEUEJ6s5k="; }; buildInputs = [ diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index c9f194a5a86..45da18f8f7b 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "meteo"; - version = "0.9.9.1"; + version = "0.9.9.2"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "sha256-kkUVTxh5svk61oDp/dpe3ILGyexYe3UaS+LgWsy+Z9s="; + sha256 = "sha256-9+FNpLjiX0zdsUnbBnNSLt/Ma/cqtclP25tl+faPlpU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index c30b9ede2bb..621fce9e457 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ appstream desktop-file-utils glib - gobject-introspection gtk3 html2text libgee diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index a2d0d73f790..294121b32ec 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc="; }; - nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja python3 wrapGAppsHook gobject-introspection ]; postPatch = '' patchShebangs build-aux/meson/postinstall.py @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { gtk3 webkitgtk desktop-file-utils - gobject-introspection gsettings-desktop-schemas ]; diff --git a/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch b/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch new file mode 100644 index 00000000000..b477f902b2f --- /dev/null +++ b/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch @@ -0,0 +1,32 @@ +From 982d38084f08950863b55043f36ce5548bd73635 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Mon, 24 Jul 2023 19:12:25 +0200 +Subject: [PATCH] Strip away BUILDCONFIG + +The `BuildConfig` field in `libsofficeapp.so` includes the entire +`PKG_CONFIG_PATH` and subsequently references to a lot of `dev` outputs +of library dependencies blowing up the closure. + +Since this is not strictly needed and the inputs are comprehensible via +`nix derivation show`, this doesn't bring a real benefit in the case of +nixpkgs anyways. +--- + desktop/source/lib/init.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx +index 8d830c0cbd00..fbdc86aa7115 100644 +--- a/desktop/source/lib/init.cxx ++++ b/desktop/source/lib/init.cxx +@@ -7097,7 +7097,7 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/) + "\"ProductVersion\": \"%PRODUCTVERSION\", " + "\"ProductExtension\": \"%PRODUCTEXTENSION\", " + "\"BuildId\": \"%BUILDID\", " +- "\"BuildConfig\": \"" BUILDCONFIG "\" " ++ "\"BuildConfig\": \"removed to avoid runtime dependencies against dev outputs of each dependency. Use 'nix derivation show' against the package to find out details about BuildConfig.\" " + "}")); + } + +-- +2.40.1 + diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 518167cb33d..70df53f1eb6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -214,6 +214,23 @@ in tar -xf ${srcs.translations} ''; + # Remove build config to reduce the amount of `-dev` outputs in the + # runtime closure. This was introduced in upstream commit + # cbfac11330882c7d0a817b6c37a08b2ace2b66f4, so the patch doesn't apply + # for 7.4. + patches = lib.optionals (lib.versionAtLeast version "7.5") [ + ./0001-Strip-away-BUILDCONFIG.patch + ]; + + # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) + # in the binary causing the closure size to blow up because of many unnecessary + # dependencies to dev outputs. This behavior was patched away in nixpkgs + # (see above), make sure these don't leak again by accident. + disallowedRequisites = lib.optionals (!kdeIntegration) + (lib.concatMap + (x: lib.optional (x?dev) x.dev) + buildInputs); + ### QT/KDE # # configure.ac assumes that the first directory that contains headers and diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 30cc891d099..559474b7417 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4="; + sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index f7d4f273a5b..84ba9c2fbb7 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.7.2"; + version = "23.7.3"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-DjVLfP6tUMUFJHZyBIMivqbjiqgQecW78YbLobOnXnM="; + hash = "sha256-Jk0KPYYB+CW60ggVn58JKJ1UX5VXWbSUC+osHG4wjR0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 8e44c1bd3b7..585da031afa 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-07-16"; + version = "unstable-2023-07-22"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "95709ed796bc1df558aa7ba3728b6eb9b6385fea"; - sha256 = "wNGVvIQkAburH37GumSZX09V++MVCNvXee5Gw7YQHtc="; + rev = "24a80b0468d9abf15207dcb962d9e14a544d53a3"; + sha256 = "D9bLsxQ/52ziIlm0A9/be8KmcqZ+xr8ZygCCG2mgGJw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/ax25-tools/default.nix b/pkgs/applications/radio/ax25-tools/default.nix index 0e806c1107e..80c42da9a3d 100644 --- a/pkgs/applications/radio/ax25-tools/default.nix +++ b/pkgs/applications/radio/ax25-tools/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-kqnLi1iobcufVWMPxUyaRsWKIPyTvtUkuMERGQs2qgY="; }; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var/lib" + ]; meta = with lib; { description = "Non-GUI tools used to configure an AX.25 enabled computer"; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index cf62da4d0e7..a8a3d0f8750 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-uI81dz0rU2/UnLvoQffuFOB3NGaTK0MJmCWGvGQKw24="; + hash = "sha256-5qq7EDCLAiCReFS1V8R2SkFI8CesmQclimcE3USGV/U="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 3dd7a542253..9a5d3c3cbbb 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/jopohl/urh"; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index b4560728e35..95f8a75e662 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1456"; + version = "1460"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-9DkmqqovVqaahoHoY30CfINEHTKn3Rqb9yVtU4fIgKw="; + hash = "sha256-9Er15zsq9Xrw66M8QOmARC1S/O5NvmpdUvOZUGc92P0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/kingstvis/default.nix b/pkgs/applications/science/electronics/kingstvis/default.nix new file mode 100644 index 00000000000..3699aebbbff --- /dev/null +++ b/pkgs/applications/science/electronics/kingstvis/default.nix @@ -0,0 +1,59 @@ +{ buildFHSEnv +, dbus +, fetchzip +, fontconfig +, freetype +, glib +, lib +, libGL +, stdenv +, xkeyboard_config +, xorg +, zlib +}: + +let + name = "kingstvis"; + version = "3.6.1"; + src = fetchzip { + url = "http://res.kingst.site/kfs/KingstVIS_v${version}.tar.gz"; + hash = "sha256-eZJ3RZWdmNx/El3Hh5kUf44pIwdvwOEkRysYBgUkS18="; + }; +in + +buildFHSEnv { + inherit name; + + targetPkgs = pkgs: (with pkgs; [ + dbus + fontconfig + freetype + glib + libGL + xkeyboard_config + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libxcb + zlib + ]); + + extraInstallCommands = '' + install -Dvm644 ${src}/Driver/99-Kingst.rules \ + $out/lib/udev/rules.d/99-Kingst.rules + ''; + + runScript = "${src}/KingstVIS"; + + meta = { + description = "Kingst Virtual Instruments Studio, software for logic analyzers"; + homepage = "http://www.qdkingst.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.luisdaranda ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index bea9381132f..1062582d82c 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "unstable-2023-02-23"; + version = "unstable-2023-06-28"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "2c1c83f75b8078ced51f92c697da3e712feb3ac3"; - hash = "sha256-THcyEifIp9v1bOofFVm9NFPqgI6NfKKys+Ea2KyNpv8="; + rev = "bb64142b07794ee685494564471e67365a093710"; + hash = "sha256-Qkk61Lh84ervtehWskSB9GKh+JPB7mI1IuG32OSZMdg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/egglog/Cargo.lock b/pkgs/applications/science/logic/egglog/Cargo.lock index a11ce808975..b2d8ef8a904 100644 --- a/pkgs/applications/science/logic/egglog/Cargo.lock +++ b/pkgs/applications/science/logic/egglog/Cargo.lock @@ -249,6 +249,7 @@ name = "egglog" version = "0.1.0" dependencies = [ "clap", + "egraph-serialize", "env_logger", "glob", "hashbrown 0.14.0", @@ -265,6 +266,7 @@ dependencies = [ "ordered-float", "regex", "rustc-hash", + "serde_json", "smallvec", "symbol_table", "symbolic_expressions", @@ -272,6 +274,18 @@ dependencies = [ ] [[package]] +name = "egraph-serialize" +version = "0.1.0" +source = "git+https://github.com/egraphs-good/egraph-serialize?rev=54b1a4f1e2f2135846b084edcb495cd159839540#54b1a4f1e2f2135846b084edcb495cd159839540" +dependencies = [ + "indexmap 2.0.0", + "once_cell", + "ordered-float", + "serde", + "serde_json", +] + +[[package]] name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -404,6 +418,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -439,6 +454,12 @@ dependencies = [ ] [[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] name = "js-sys" version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -607,6 +628,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits", + "rand", + "serde", ] [[package]] @@ -682,6 +705,25 @@ dependencies = [ ] [[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", + "serde", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "serde", +] + +[[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -765,12 +807,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] +name = "serde" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", +] + +[[package]] name = "siphasher" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/science/logic/egglog/default.nix b/pkgs/applications/science/logic/egglog/default.nix index f3ebe9f246f..65dbcd5a1b4 100644 --- a/pkgs/applications/science/logic/egglog/default.nix +++ b/pkgs/applications/science/logic/egglog/default.nix @@ -5,18 +5,19 @@ rustPlatform.buildRustPackage { pname = "egglog"; - version = "unstable-2023-07-11"; + version = "unstable-2023-07-19"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "14a6fc6060c09541728ae460e0a92909fabf508f"; - hash = "sha256-1osdjd86xZHUAwvPBNxWYlkX6tKt+jI05AEVYr77YSQ="; + rev = "9fe03ad35a2a975a2c9140a641ba91266b7a72ce"; + hash = "sha256-9JeJJdZW8ecogReJzQrp3hFkK/pp/+pLxJMNREWuiyI="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "egraph-serialize-0.1.0" = "sha256-1lDaoR/1TNFW+uaf3UdfDZgXlxyAb37Ij7yky16xCG8="; "symbol_table-0.2.0" = "sha256-f9UclMOUig+N5L3ibBXou0pJ4S/CQqtaji7tnebVbis="; "symbolic_expressions-5.0.3" = "sha256-mSxnhveAItlTktQC4hM8o6TYjgtCUgkdZj7i6MR4Oeo="; }; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 05c2246d37a..d08a342a28f 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-97gkBViNIqs03JuPlUOyE/X3UKzF5KVZBKH3JnXw37E="; + sha256 = "sha256-gnE0uISKfUqUdmrHI6F7nLOFcsQALjRy584nMRrC68w="; }; - cargoHash = "sha256-9aLCElsoWTUsuy+muhCcgo/1xmRYsbQDvhRa5YsV3lM="; + cargoHash = "sha256-rjxJ4bGep5OJUWME+EV5CqEsFY1SuoU07ANL0cbD+DU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4cd2511786b..5af927294d6 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -13,7 +13,7 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , cudnnSupport ? cudaSupport , ncclSupport ? false , pythonSupport ? false, python ? null, numpy ? null diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index f885dae444b..91d208a56ed 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -2,7 +2,8 @@ , fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false -, cudaSupport ? false, cudaPackages ? {}, addOpenGLRunpath, cudatoolkit, nvidia_x11 +, config +, cudaSupport ? config.cudaSupport, cudaPackages ? { }, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport }: diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 48c36b6677f..355238ace15 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fricas"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2"; - sha256 = "sha256-amAGPLQo70nKATyZM7h3yX5mMUxCwOFwb/fTIWB5hUQ="; + sha256 = "sha256-5RPcffM0GN0l6r8IgHJlwdxwwp2y4kIdJ5M3JnGZCzc="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index 0105148d962..b790116a58b 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "labplot"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { url = "https://download.kde.org/stable/labplot/labplot-${version}.tar.xz"; - sha256 = "sha256-XfxnQxCQSkOHXWnj4mCh/t2WjmwbHs2rp1WrGqOMupA="; + sha256 = "sha256-K24YFRfPtuDf/3uJXz6yDHzjWeZzLThUXgdXya6i2u8="; }; cmakeFlags = [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index c0f370d8845..289c9b7b658 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -2,7 +2,7 @@ , config , lib , cudaPackages -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , lang ? "en" , webdoc ? false , version ? null diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index f8e6555d763..7cd699e58e3 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -125,8 +125,9 @@ in stdenv.mkDerivation { "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" # Fix xkeyboard config path for Qt "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - # wayland isn't supported - "--set QT_QPA_PLATFORM xcb" + # if wayland isn't supported we fail over to xcb + # see https://github.com/qt/qtbase/blob/35d0f012ee9b95e8cf3563a41d710ff3c023d841/src/gui/kernel/qguiapplication.cpp#L1218 + "--set QT_QPA_PLATFORM wayland;xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 240a1759397..1e7af371c50 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake , opencv3, gtest, blas, gomp, llvmPackages, perl -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 +, cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 , cudnnSupport ? cudaSupport }: diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index e3ce66356ba..a029f5440b2 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, - cudaSupport ? false, cudaPackages }: + config, + cudaSupport ? config.cudaSupport, cudaPackages }: assert cudaSupport -> cudaPackages != { }; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index a47dff4e3e8..aa24fa6a5d3 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit , singlePrec ? true +, config , enableMpi ? false -, enableCuda ? false +, enableCuda ? config.cudaSupport , cpuAcceleration ? null }: diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix index f1e55644fa5..e7c646faf0a 100644 --- a/pkgs/applications/system/booster/default.nix +++ b/pkgs/applications/system/booster/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "booster"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "anatol"; repo = pname; rev = version; - hash = "sha256-mUmh2oAD3G9cpv7yiKcFaXJkEdo18oMD/sttnYnAQL8="; + hash = "sha256-+0pY4/f/qfIT1lLn2DXmJBZcDDEOil4H3zNY3911ACQ="; }; - vendorHash = "sha256-czzNAUO4eRYTwfnidNLqyvIsR0nyzR9cb+G9/5JRvKs="; + vendorHash = "sha256-RmRY+HoNuijfcK8gNbOIyWCOa50BVJd3IZv2+Pc3FYw="; postPatch = '' substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" diff --git a/pkgs/applications/system/psitop/default.nix b/pkgs/applications/system/psitop/default.nix new file mode 100644 index 00000000000..a3080338b89 --- /dev/null +++ b/pkgs/applications/system/psitop/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "psitop"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jamespwilliams"; + repo = "psitop"; + rev = version; + hash = "sha256-C8WEbA7XXohKFz7QgII0LPU1eJ4Z7CSlmEOamgo4wQI="; + }; + + vendorHash = "sha256-oLtKpBvTsM5TbzfWIDfqgb7DL5D3Mldu0oimVeiUeSc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Top for /proc/pressure"; + homepage = "https://github.com/jamespwilliams/psitop"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 83cba0abc8d..c54c92c2010 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitLab -, fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -37,6 +37,14 @@ stdenv.mkDerivation rec { hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw="; }; + patches = [ + # Fix closing confirmation dialogs not showing + (fetchpatch { + url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch"; + hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A="; + }) + ]; + postPatch = '' patchShebangs build-aux/meson/postinstall.py ''; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index ec2d0d9250d..5a50ba9448a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitea , fetchurl +, fetchpatch , runCommand , fcft , freetype @@ -101,6 +102,17 @@ stdenv.mkDerivation rec { hash = "sha256-YCwmPSn+XtF7HkMOFJft7j/2vr+8UE59yu/iGZ1dT8A="; }; + patches = [ + # Check viewporter protocol support before using it, fixes crash under Mir + # Remove when https://codeberg.org/dnkl/foot/pulls/1445 in version > 1.15.1 + (fetchpatch { + name = "0001-foot-dont-try-to-use-a-non-existing-viewporter-interface.patch"; + url = "https://codeberg.org/dnkl/foot/commit/9d75c551465fa3dbb3cd20ae87d6de294fcebce1.patch"; + excludes = [ "CHANGELOG.md" ]; + hash = "sha256-sVfGbudsmwh7phbbobBgSXoGe1lKJ8s1UdyBnVLmLYQ="; + }) + ]; + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 828af0e7f7b..9b4a1be708f 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -29,14 +29,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.29.1"; + version = "0.29.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-C7Km98N/ER+IJ964V+BFkVF8N7uRmraPIpHn8yJtb/Q="; + hash = "sha256-ureJHG6Jh4bsXqQZnGwY5Hlq7sXxYX3iTajb8ZkpZw8="; }; goModules = (buildGoModule { @@ -190,8 +190,8 @@ buildPythonApplication rec { installPhase = '' runHook preInstall - mkdir -p $out - mkdir -p $kitten/bin + mkdir -p "$out" + mkdir -p "$kitten/bin" ${if stdenv.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" @@ -202,8 +202,8 @@ buildPythonApplication rec { installManPage 'docs/_build/man/kitty.1' '' else '' - cp -r linux-package/{bin,share,lib} $out - cp linux-package/bin/kitten $kitten/bin/kitten + cp -r linux-package/{bin,share,lib} "$out" + cp linux-package/bin/kitten "$kitten/bin/kitten" ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" @@ -220,7 +220,7 @@ buildPythonApplication rec { mkdir -p $terminfo/share mv "$terminfo_src" $terminfo/share/terminfo - mkdir -p $out/nix-support + mkdir -p "$out/nix-support" echo "$terminfo" >> $out/nix-support/propagated-user-env-packages cp -r 'shell-integration' "$shell_integration" diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 04845780614..cf9ba51ffae 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { ]; postPatch = '' + substituteInPlace dvc/analytics.py --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' substituteInPlace dvc/daemon.py \ --subst-var-by dvc "$out/bin/dcv" ''; diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index 4675b22a619..5e1faa58dce 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-//sQ0s8bBQzuu5aO3RjPRjFuVYiGW6BwSPoCWKAx9DQ="; + hash = "sha256-J2tmDpt4vRFgD5yfFZOdBLROvyZVEthc+MHM1Yta5jI="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 ]; - cargoHash = "sha256-rkhkFnRDtMTWFM+E5C4jR7TWtHdy3WUtIzvGDDLHqtE="; + cargoHash = "sha256-AsUHswR7+wMyAvOp3rkvRJvThHLH993gQ+/V38vbbNQ="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 7fa0e6c4bd4..a350f1d91ed 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.32.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-YnIwrx/NEOH3yXkkCq30i9Jt2IXKX5IX8BuM6+u9tvs="; + hash = "sha256-DfcafkgauO0mlMEJTfR7hjnkY1QJ4dUyrWv/bqJlVAo="; }; - vendorHash = "sha256-fbf5EKDISdptbiJipvqygfjGWAP6fPXbYsgxVq8eUnM="; + vendorHash = "sha256-7Izhqma/zukH9M7EvV9I4axefVaTDoNVXQmLx+GjAt0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index 155feb25fa8..f7b5d082e1e 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -7,8 +7,11 @@ , libSM , fontconfig , libsecret +, git +, git-credential-manager , gnupg , pass +, testers , withGuiSupport ? true , withLibsecretSupport ? true , withGpgSupport ? true @@ -17,34 +20,48 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-PeQ9atSCgSvduAcqY2CnNJH3ucvoInduA5i8dPUJiHo="; + hash = "sha256-XXtir/sSjJ1rpv3UQHM3Kano/fMBch/sm8ZtYwGyFyQ="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - dotnetInstallFlags = [ "--framework" "net6.0" ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnetInstallFlags = [ "--framework" "net7.0" ]; executables = [ "git-credential-manager" ]; runtimeDeps = [ fontconfig ] ++ lib.optionals withGuiSupport [ libX11 libICE libSM ] ++ lib.optional withLibsecretSupport libsecret; - makeWrapperArgs = lib.optionals withGpgSupport [ "--prefix" "PATH" ":" (lib.makeBinPath [ gnupg pass ]) ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}" + ]; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = git-credential-manager; + }; + }; meta = with lib; { - description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services."; + description = "A secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services"; homepage = "https://github.com/git-ecosystem/git-credential-manager"; license = with licenses; [ mit ]; platforms = platforms.unix; maintainers = with maintainers; [ _999eagle ]; + longDescription = '' + git-credential-manager is a secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. + + > requires sandbox to be disabled on MacOS, so that + .NET can find `/usr/bin/codesign` to sign the compiled binary. + This problem is common to all .NET packages on MacOS with Nix. + ''; }; } diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 87806d1fd62..96dbf0bb965 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -28,8 +28,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.52.0"; sha256 = "0g7bzzm04lrfar3l1rl1lsb0q1nm0ix5fc24bhm4faxvzdyd3vg7"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.0"; sha256 = "0p4msajlfbc536qpfnhz2w81rmwgwivfbhdyfk3d198vbadv8zlq"; }) (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.28.0"; sha256 = "1z2irqbjqxawyxq2778bcjbj0x8m63dh3lj5m04knq48wl4wh40x"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -37,7 +36,33 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) @@ -45,7 +70,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta1.21216.1"; sha256 = "10p3i10sh9aarqfzac3bgmv9zabb8m5c2aylf3chwlh71kp9l63l"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) @@ -59,6 +84,7 @@ (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 4285c5be8a3..a45f184881d 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - hash = "sha256-r1z97sgqo1IyR0oW5b3bMGTUHGE8U+hrWgQ0Su9FRrw="; + hash = "sha256-lZx+sJQttclZPET0jkv3dmpQysCpsYani+La7yfSUlI="; }; - vendorHash = "sha256-did6qAUawmQ/juLzJWIXGzmErj9tBKgM7HROTezX+tw="; + vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 05e21b641e9..f571cee0fa4 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.6"; + version = "3.17.8"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-o3Z1xPu5RcspU4m3Bb6ydZkXOMgOMJPN/+TLekwe/wI="; + hash = "sha256-d1vbLlGKln/zcuuKZgNOcu/z15co3p8ecrwL5lucIEk="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 4e39d46b66c..797b508e13c 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glab"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-mNwjyKde9xlaGVwK7oIbPGPipxKTvLwf6uMZVjL+joc="; + hash = "sha256-K7yGRuIfYEqs4ziystxLMK+dYUZoyGlBJAmx2qmY08Q="; }; vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s="; diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index b163fc2aa60..daf56c17445 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { python3 # for build scripts pkgconf wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -79,7 +80,6 @@ stdenv.mkDerivation rec { elfutils gexiv2 glib - gobject-introspection gst-plugins-base gstreamer gtk3 diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 7e85b65de35..2643a449c60 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins + ffmpeg frei0r sox gtk3 ladspaPlugins (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ])) ]; diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/applications/video/iina/default.nix index 20089630c87..8e317102b36 100644 --- a/pkgs/applications/video/iina/default.nix +++ b/pkgs/applications/video/iina/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - hash = "sha256-rF5yv2QHWVUUsyf/u78jWRn4C629GBJgB/i8YnaKHBk="; + hash = "sha256-Sz9sS+07t32+KcEr9tXQlZKEr7Ace1mjX9caOicIiZE="; }; nativeBuildInputs = [ undmg ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "The modern media player for macOS"; platforms = platforms.darwin; license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ arkivm stepbrobd ]; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 70aaa32526e..b93d7d6606c 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -67,7 +67,7 @@ , sdl2Support ? true, SDL2 , sixelSupport ? false, libsixel , speexSupport ? true, speex -, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift +, swiftSupport ? stdenv.isDarwin, swift , theoraSupport ? true, libtheora , vaapiSupport ? x11Support || waylandSupport, libva , vapoursynthSupport ? false, vapoursynth @@ -82,7 +82,20 @@ let inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); -in stdenv.mkDerivation (finalAttrs: { + + overrideSDK = platform: version: + platform // lib.optionalAttrs (platform ? darwinMinVersion) { + darwinMinVersion = version; + }; + + stdenv' = if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 + then stdenv.override (old: { + buildPlatform = overrideSDK old.buildPlatform "10.15"; + hostPlatform = overrideSDK old.hostPlatform "10.15"; + targetPlatform = overrideSDK old.targetPlatform "10.15"; + }) + else stdenv; +in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; version = "0.35.1"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 2ac85084b41..286fc8fcc95 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V miangraham ]; + maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/applications/video/recapp/default.nix index 7ec88af821e..1e644ff9f41 100644 --- a/pkgs/applications/video/recapp/default.nix +++ b/pkgs/applications/video/recapp/default.nix @@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication rec { ninja pkg-config wrapGAppsHook + gobject-introspection ]; buildInputs = [ libnotify librsvg - gobject-introspection gtk3 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix index 75c8fbf982a..e601f0443c4 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "sha256-Du/Dq7AUH5CeEKYr0kxcqguAyRVI5Ame41nU3FGvG+U="; + sha256 = "sha256-epz/KoXo84zzCD1dzclRWgeQSqrgwEtaIGvrTPuN9hw="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 56ba7957a5a..20a9772021a 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation rec { itstool pkg-config yelp-tools + gobject-introspection ]; buildInputs = [ clutter-gst clutter-gtk glib - gobject-introspection gst-plugins-bad gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 6e3e9ba0d12..eada778e1c6 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,5 +1,7 @@ { stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages , csmSupport ? false, seabios ? null +, fdSize2MB ? csmSupport +, fdSize4MB ? false , secureBoot ? false , httpSupport ? false , tpmSupport ? false @@ -49,7 +51,9 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ++ lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ] ++ lib.optionals sourceDebug [ "-D SOURCE_DEBUG_ENABLE=TRUE" ] ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] - ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] + ++ lib.optionals csmSupport [ "-D CSM_ENABLE" ] + ++ lib.optionals fdSize2MB ["-D FD_SIZE_2MB"] + ++ lib.optionals fdSize4MB ["-D FD_SIZE_4MB"] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tlsSupport [ "-D NETWORK_TLS_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; @@ -100,6 +104,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: { homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; inherit (edk2.meta) platforms; - maintainers = [ lib.maintainers.raitobezarius ]; + maintainers = with lib.maintainers; [ adamcstephens raitobezarius ]; }; }) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index fbc4482536f..7b994433840 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -23,6 +23,7 @@ let "test_exec.py" "test_hooks.py" "test_hostname.py" + "test_oci_features" "test_paths.py" "test_pid.py" "test_pid_file.py" @@ -38,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-T51dVNtqQbXoPshlAkBzJOGTNTPM+AlqRYbqS8GX2NE="; + hash = "sha256-qPbJ8h/s4E7EmNlgBdrNZ0AW0D/N7PkK57C1cXjuM9U="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index e3af5774c18..2bb3dc24fb0 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -40,7 +40,6 @@ let runc crun conmon - slirp4netns fuse-overlayfs util-linux iptables @@ -57,18 +56,19 @@ let aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark + slirp4netns ]; }; in buildGoModule rec { pname = "podman"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-PG2/iMsr/shLqhuYSvhT1I1kPDh0g0ebnGUHHzA7u5A="; + hash = "sha256-8cfEZBYhR5CWkHEpIZ0j011gyV6lnY7z4KgJPJr0MfQ="; }; patches = [ diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index d1fe9bcc9b0..db6455cab4c 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,9 +1,9 @@ diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index 4f25b4d26..8a79862fd 100644 +index a118285f7..d775f0099 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go -@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward - case notInstalled: +@@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState, + case machine.NotInstalled: fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") fmt.Printf("address can't be used by podman. ") - if helper := findClaimHelper(); len(helper) > 0 { @@ -11,6 +11,6 @@ index 4f25b4d26..8a79862fd 100644 - fmt.Printf("\n\tsudo %s install\n", helper) - fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) - } - case machineLocal: + case machine.MachineLocal: fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") - case claimUnsupported: + case machine.ClaimUnsupported: diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b19f17275ad..3c377d011bd 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor + gobject-introspection ]; outputs = [ "out" "doc" ]; @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = toString fontsConf; propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection + buildInputs = [ cairo librsvg dbus gdk-pixbuf git luaEnv libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 27e147d253a..5c358945434 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -33,7 +33,7 @@ }: let pname = "gamescope"; - version = "3.12.0-beta9"; + version = "3.12.0-beta10"; vkroots = fetchFromGitHub { owner = "Joshua-Ashton"; @@ -49,7 +49,7 @@ stdenv.mkDerivation { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-nPFHMRp3uq2CIxY3EdaoTltqyb5z0kFwXw5U9ajbrfo="; + hash = "sha256-31zGo22Z0+zQ81LmzI+Xif9eREzRpS0S9+nK1i/cBCY="; }; patches = [ diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 3472c760428..73136980aa9 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -19,7 +19,11 @@ python3Packages.buildPythonApplication rec { sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; }; - buildInputs = [ libpulseaudio libnotify gobject-introspection ]; + nativeBuildInputs = [ + gobject-introspection + ]; + + buildInputs = [ libpulseaudio libnotify ]; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw pygobject3 diff --git a/pkgs/applications/window-managers/wayfire/applications.nix b/pkgs/applications/window-managers/wayfire/applications.nix deleted file mode 100644 index a77d3f8bf5d..00000000000 --- a/pkgs/applications/window-managers/wayfire/applications.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, newScope, wayfirePlugins }: - -lib.makeExtensible (self: with self; { - inherit wayfirePlugins; - - callPackage = newScope self; - - wayfire = callPackage ./. { }; - - wcm = callPackage ./wcm.nix { - inherit (wayfirePlugins) wf-shell; - }; - - wrapWayfireApplication = callPackage ./wrapper.nix { }; - - withPlugins = selector: self // { - wayfire = wrapWayfireApplication wayfire selector; - wcm = wrapWayfireApplication wcm selector; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index 830a918fcb7..111a8c87dd7 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -1,12 +1,11 @@ -{ newScope, wayfire }: - -let - self = with self; { - inherit wayfire; - - callPackage = newScope self; +{ lib, pkgs }: +lib.makeScope pkgs.newScope (self: + let + inherit (self) callPackage; + in { + wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; + wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; - }; -in -self + } +) diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix new file mode 100644 index 00000000000..110fcfe75ff --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayfire +, wf-config +, gtkmm3 +, gtk-layer-shell +, libxkbcommon +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wayfire-plugins-extra"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "WayfireWM"; + repo = "wayfire-plugins-extra"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo="; + }; + + postPatch = '' + substituteInPlace metadata/meson.build \ + --replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + wayfire + wf-config + libxkbcommon + xcbutilwm + gtkmm3 + gtk-layer-shell + ]; + + mesonFlags = [ "--sysconfdir /etc" ]; + + meta = { + homepage = "https://github.com/WayfireWM/wayfire-plugins-extra"; + description = "Additional plugins for Wayfire"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix index e972929237d..35bb3ad1583 100644 --- a/pkgs/applications/window-managers/wayfire/wrapper.nix +++ b/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -1,39 +1,32 @@ -{ runCommand, lib, makeWrapper, wayfirePlugins }: +{ symlinkJoin, lib, makeWrapper, wayfire, plugins ? [ ] }: -let - inherit (lib) escapeShellArg makeBinPath; +symlinkJoin { + name = "wayfire-wrapped-${lib.getVersion wayfire}"; - xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell"; - - makePluginPath = lib.makeLibraryPath; - makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath; -in + nativeBuildInputs = [ makeWrapper ]; -application: + paths = [ + wayfire + ] ++ plugins; -choosePlugins: + postBuild = '' + for binary in $out/bin/*; do + wrapProgram $binary \ + --prefix WAYFIRE_PLUGIN_PATH : $out/lib/wayfire \ + --prefix WAYFIRE_PLUGIN_XML_PATH : $out/share/wayfire/metadata + done + ''; -let - plugins = choosePlugins wayfirePlugins; -in + preferLocalBuild = true; -runCommand "${application.name}-wrapped" { - nativeBuildInputs = [ makeWrapper ]; - - passthru = application.passthru // { - unwrapped = application; + passthru = wayfire.passthru // { + unwrapped = wayfire; }; - inherit (application) meta; -} '' - mkdir -p $out/bin - for bin in ${application}/bin/* - do - makeWrapper "$bin" $out/bin/''${bin##*/} \ - --suffix PATH : ${escapeShellArg (makeBinPath plugins)} \ - --suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \ - --suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)} - done - find ${application} -mindepth 1 -maxdepth 1 -not -name bin \ - -exec ln -s '{}' $out ';' -'' + meta = wayfire.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (wayfire.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 07ac6737f39..7f5cd4cf4af 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -81,8 +81,18 @@ for flag in "${!hardeningEnableMap[@]}"; do hardeningCFlags+=('-fPIC') ;; strictoverflow) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi - hardeningCFlags+=('-fno-strict-overflow') + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi + if (( @isClang@ )); then + # In Clang, -fno-strict-overflow only serves to set -fwrapv and is + # reported as an unused CLI argument if -fwrapv or -fno-wrapv is set + # explicitly, so we side step that by doing the conversion here. + # + # See: https://github.com/llvm/llvm-project/blob/llvmorg-16.0.6/clang/lib/Driver/ToolChains/Clang.cpp#L6315 + # + hardeningCFlags+=('-fwrapv') + else + hardeningCFlags+=('-fno-strict-overflow') + fi ;; format) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 551074e0a21..53141cac5df 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -609,6 +609,8 @@ stdenv.mkDerivation { env = { + inherit isClang; + # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; shell = getBin shell + shell.shellPath or ""; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 6e2de7fa11b..1ab4a0db827 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, bintools-unwrapped, llvmPackages_13, coreutils }: - +{ lib, stdenv, bintools-unwrapped, llvmPackages, llvmPackages_13, coreutils }: + +let + # aarch64-darwin needs a clang that can build arm64e binaries, so make sure a version of LLVM + # is used that can do that, but prefer the stdenv one if it is new enough. + llvmPkgs = if (lib.versionAtLeast (lib.getVersion llvmPackages.clang) "13") + then llvmPackages + else llvmPackages_13; + in if stdenv.hostPlatform.isStatic then throw '' libredirect is not available on static builds. @@ -39,11 +46,11 @@ else stdenv.mkDerivation rec { # and the library search directory for libdl. # We can't build this on x86_64, because the libSystem we point to doesn't # like arm64(e). - PATH=${bintools-unwrapped}/bin:${llvmPackages_13.clang-unwrapped}/bin:$PATH \ + PATH=${bintools-unwrapped}/bin:${llvmPkgs.clang-unwrapped}/bin:$PATH \ clang -arch x86_64 -arch arm64 -arch arm64e \ - -isystem ${llvmPackages_13.clang.libc}/include \ - -isystem ${llvmPackages_13.libclang.lib}/lib/clang/*/include \ - -L${llvmPackages_13.clang.libc}/lib \ + -isystem ${llvmPkgs.clang.libc}/include \ + -isystem ${llvmPkgs.libclang.lib}/lib/clang/*/include \ + -L${llvmPkgs.clang.libc}/lib \ -Wl,-install_name,$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ -shared -o "$libName" diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 9ecc16450cc..19211a813eb 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -106,7 +106,7 @@ static int open_needs_mode(int flags) WRAPPER(int, open)(const char * path, int flags, ...) { - int (*open_real) (const char *, int, mode_t) = LOOKUP_REAL(open); + int (*open_real) (const char *, int, ...) = LOOKUP_REAL(open); mode_t mode = 0; if (open_needs_mode(flags)) { va_list ap; @@ -139,7 +139,7 @@ WRAPPER_DEF(open64) WRAPPER(int, openat)(int dirfd, const char * path, int flags, ...) { - int (*openat_real) (int, const char *, int, mode_t) = LOOKUP_REAL(openat); + int (*openat_real) (int, const char *, int, ...) = LOOKUP_REAL(openat); mode_t mode = 0; if (open_needs_mode(flags)) { va_list ap; diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index 3cae1c16a2e..04f47362b10 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -22,7 +22,14 @@ const exec = async (...args) => { const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { return new Promise((resolve, reject) => { - https.get(url, (res) => { + const get = (url, redirects = 0) => https.get(url, (res) => { + if(redirects > 10) { + reject('Too many redirects!'); + return; + } + if(res.statusCode === 301 || res.statusCode === 302) { + return get(res.headers.location, redirects + 1) + } const file = fs.createWriteStream(fileName) const hash = crypto.createHash(hashType) res.pipe(file) @@ -35,6 +42,7 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { }) res.on('error', e => reject(e)) }) + get(url) }) } diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index ee414ea3280..d09f6c8568b 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -5,7 +5,7 @@ with pkgs; rec { sourceTarball = args: import ./source-tarball.nix ( - { inherit stdenv autoconf automake libtool; + { inherit lib stdenv autoconf automake libtool; } // args); makeSourceTarball = sourceTarball; # compatibility diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 583831d4821..348cd5b8345 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -154,8 +154,8 @@ stdenv.mkDerivation ( // - (if buildOutOfSourceTree - then { + (lib.optionalAttrs buildOutOfSourceTree + { preConfigure = # Build out of source tree and make the source tree read-only. This # helps catch violations of the GNU Coding Standards (info @@ -170,5 +170,5 @@ stdenv.mkDerivation ( ${lib.optionalString (preConfigure != null) preConfigure} ''; } - else {}) + ) ) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index d624d071cc2..fbc8bc6b258 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -10,7 +10,7 @@ if officialRelease then "" else "pre${toString (src.rev or src.revCount or "")}" -, src, stdenv, autoconf, automake, libtool +, src, lib, stdenv, autoconf, automake, libtool , # By default, provide all the GNU Build System as input. bootstrapBuildInputs ? [ autoconf automake libtool ] , ... } @ args: @@ -73,7 +73,7 @@ stdenv.mkDerivation ( } # Then, the caller-supplied attributes. - // args // + // (builtins.removeAttrs args [ "lib" ]) // # And finally, our own stuff. { @@ -117,7 +117,7 @@ stdenv.mkDerivation ( version = version + versionSuffix; }; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = "Source distribution"; # Tarball builds are generally important, so give them a high diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index e4db2c8a057..f04eeeaa9bf 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -193,8 +193,8 @@ in }; graphene-sys = attrs: { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ graphene gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; + buildInputs = [ graphene ]; }; nettle-sys = attrs: { diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 9099a38b75b..d095974513c 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -242,7 +242,11 @@ rec { */ - writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; + writeScriptBin = name: text: writeTextFile { + inherit name text; + executable = true; + destination = "/bin/${name}"; + }; /* Similar to writeScript. Writes a Shell script and checks its syntax. @@ -374,6 +378,9 @@ rec { # Pointless to do this on a remote machine. preferLocalBuild = true; allowSubstitutes = false; + meta = { + mainProgram = name; + }; } '' n=$out/bin/$name diff --git a/pkgs/build-support/trivial-builders/test/default.nix b/pkgs/build-support/trivial-builders/test/default.nix new file mode 100644 index 00000000000..683f4b9fd04 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/default.nix @@ -0,0 +1,33 @@ +/* + Run all tests with: + + cd nixpkgs + nix-build -A tests.trivial-builders + + or run a specific test with: + + cd nixpkgs + nix-build -A tests.trivial-builders.foo + +*/ + +{ callPackage, lib, stdenv }: +let + inherit (lib) recurseIntoAttrs; +in +recurseIntoAttrs { + concat = callPackage ./concat-test.nix {}; + linkFarm = callPackage ./link-farm.nix {}; + overriding = callPackage ../test-overriding.nix {}; + references = + # VM test not supported beyond linux yet + if stdenv.hostPlatform.isLinux + then callPackage ./references.nix {} + else null; + writeCBin = callPackage ./writeCBin.nix {}; + writeScriptBin = callPackage ./writeScriptBin.nix {}; + writeShellScript = callPackage ./write-shell-script.nix {}; + writeShellScriptBin = callPackage ./writeShellScriptBin.nix {}; + writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix {}; + writeTextFile = callPackage ./write-text-file.nix {}; +} diff --git a/pkgs/build-support/trivial-builders/test/write-text-file.nix b/pkgs/build-support/trivial-builders/test/write-text-file.nix index ac83a75fca4..2e6685c1980 100644 --- a/pkgs/build-support/trivial-builders/test/write-text-file.nix +++ b/pkgs/build-support/trivial-builders/test/write-text-file.nix @@ -1,34 +1,71 @@ -{ writeTextFile }: +/* + To run: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeTextFile + + or to run an individual test case + + cd nixpkgs + nix-build -A tests.trivial-builders.writeTextFile.foo +*/ +{ lib, runCommand, runtimeShell, writeTextFile }: let veryWeirdName = ''here's a name with some "bad" characters, like spaces and quotes''; -in writeTextFile { - name = "weird-names"; - destination = "/etc/${veryWeirdName}"; - text = ''passed!''; - checkPhase = '' - # intentionally hardcode everything here, to make sure - # Nix does not mess with file paths - - name="here's a name with some \"bad\" characters, like spaces and quotes" - fullPath="$out/etc/$name" - - if [ -f "$fullPath" ]; then - echo "[PASS] File exists!" - else - echo "[FAIL] File was not created at expected path!" - exit 1 - fi - - content=$(<"$fullPath") - expected="passed!" - - if [ "$content" = "$expected" ]; then - echo "[PASS] Contents match!" - else - echo "[FAIL] File contents don't match!" - echo " Expected: $expected" - echo " Got: $content" - exit 2 - fi - ''; +in +lib.recurseIntoAttrs { + + different-exe-name = + let + pkg = writeTextFile { + name = "bar"; + destination = "/bin/foo"; + executable = true; + text = '' + #!${runtimeShell} + echo hi + ''; + }; + in + assert pkg.meta.mainProgram == "foo"; + assert baseNameOf (lib.getExe pkg) == "foo"; + assert pkg.name == "bar"; + runCommand "test-writeTextFile-different-exe-name" {} '' + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + x=$(foo) + [[ "$x" == hi ]] + touch $out + ''; + + weird-name = writeTextFile { + name = "weird-names"; + destination = "/etc/${veryWeirdName}"; + text = ''passed!''; + checkPhase = '' + # intentionally hardcode everything here, to make sure + # Nix does not mess with file paths + + name="here's a name with some \"bad\" characters, like spaces and quotes" + fullPath="$out/etc/$name" + + if [ -f "$fullPath" ]; then + echo "[PASS] File exists!" + else + echo "[FAIL] File was not created at expected path!" + exit 1 + fi + + content=$(<"$fullPath") + expected="passed!" + + if [ "$content" = "$expected" ]; then + echo "[PASS] Contents match!" + else + echo "[FAIL] File contents don't match!" + echo " Expected: $expected" + echo " Got: $content" + exit 2 + fi + ''; + }; } diff --git a/pkgs/build-support/trivial-builders/test/writeCBin.nix b/pkgs/build-support/trivial-builders/test/writeCBin.nix new file mode 100644 index 00000000000..56cab45b380 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/writeCBin.nix @@ -0,0 +1,43 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeCBin +*/ + +{ lib, writeCBin, runCommand }: +let + output = "hello"; + pkg = writeCBin "test-script" '' + #include <stdio.h> + int main () { + printf("hello\n"); + return 0; + } + ''; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeCBin" { } '' + + echo Testing with getExe... + + target=${lib.getExe pkg} + expected=${lib.escapeShellArg output} + got=$("$target") + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + echo Testing with makeBinPath... + + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + got=$(test-script) + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + touch $out + '' + diff --git a/pkgs/build-support/trivial-builders/test/writeScriptBin.nix b/pkgs/build-support/trivial-builders/test/writeScriptBin.nix new file mode 100644 index 00000000000..1487443130d --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/writeScriptBin.nix @@ -0,0 +1,39 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeShellScriptBin +*/ + +{ lib, writeScriptBin, runCommand }: +let + output = "hello"; + pkg = writeScriptBin "test-script" '' + echo ${lib.escapeShellArg output} + ''; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeScriptBin" { } '' + + echo Testing with getExe... + + target=${lib.getExe pkg} + expected=${lib.escapeShellArg output} + got=$("$target") + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + echo Testing with makeBinPath... + + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + got=$(test-script) + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + touch $out + '' + diff --git a/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix b/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix new file mode 100644 index 00000000000..e93410e25bc --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix @@ -0,0 +1,39 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeShellScriptBin +*/ + +{ lib, writeShellScriptBin, runCommand }: +let + output = "hello"; + pkg = writeShellScriptBin "test-script" '' + echo ${lib.escapeShellArg output} + ''; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeShellScriptBin" { } '' + + echo Testing with getExe... + + target=${lib.getExe pkg} + expected=${lib.escapeShellArg output} + got=$("$target") + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + echo Testing with makeBinPath... + + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + got=$(test-script) + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + touch $out + '' + diff --git a/pkgs/build-support/writers/data.nix b/pkgs/build-support/writers/data.nix new file mode 100644 index 00000000000..48f9bc547ed --- /dev/null +++ b/pkgs/build-support/writers/data.nix @@ -0,0 +1,80 @@ +{ lib, runCommand, dasel }: +let + daselBin = lib.getExe dasel; + + inherit (lib) + last + optionalString + types + ; +in +rec { + # Creates a transformer function that writes input data to disk, transformed + # by both the `input` and `output` arguments. + # + # Type: makeDataWriter :: input -> output -> nameOrPath -> data -> (any -> string) -> string -> string -> any -> derivation + # + # input :: T -> string: function that takes the nix data and returns a string + # output :: string: script that takes the $inputFile and write the result into $out + # nameOrPath :: string: if the name contains a / the files gets written to a sub-folder of $out. The derivation name is the basename of this argument. + # data :: T: the data that will be converted. + # + # Example: + # writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; }; + # myConfig = writeJSON "config.json" { hello = "world"; } + # + makeDataWriter = { input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: + assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); + let + name = last (builtins.split "/" nameOrPath); + in + runCommand name + { + input = input data; + passAsFile = [ "input" ]; + } '' + ${output} + + ${optionalString (types.path.check nameOrPath) '' + mv $out tmp + mkdir -p $out/$(dirname "${nameOrPath}") + mv tmp $out/${nameOrPath} + ''} + ''; + + # Writes the content to text. + # + # Example: + # writeText "filename.txt" "file content" + writeText = makeDataWriter { + input = toString; + output = "cp $inputPath $out"; + }; + + # Writes the content to a JSON file. + # + # Example: + # writeJSON "data.json" { hello = "world"; } + writeJSON = makeDataWriter { + input = builtins.toJSON; + output = "${daselBin} -f $inputPath -r json -w json > $out"; + }; + + # Writes the content to a TOML file. + # + # Example: + # writeTOML "data.toml" { hello = "world"; } + writeTOML = makeDataWriter { + input = builtins.toJSON; + output = "${daselBin} -f $inputPath -r json -w toml > $out"; + }; + + # Writes the content to a YAML file. + # + # Example: + # writeYAML "data.yaml" { hello = "world"; } + writeYAML = makeDataWriter { + input = builtins.toJSON; + output = "${daselBin} -f $inputPath -r json -w yaml > $out"; + }; +} diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 3016a45b8a0..a161322cd35 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,367 +1,14 @@ -{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: +{ config, lib, callPackages }: let aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {}; - writers = with lib; rec { - # Base implementation for non-compiled executables. - # Takes an interpreter, for example `${pkgs.bash}/bin/bash` - # - # Examples: - # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; } - # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" - makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: - assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); - assert lib.or (types.path.check content) (types.str.check content); - let - name = last (builtins.split "/" nameOrPath); - in + # Writers for JSON-like data structures + dataWriters = callPackages ./data.nix { }; - pkgs.runCommandLocal name (if (types.str.check content) then { - inherit content interpreter; - passAsFile = [ "content" ]; - } else { - inherit interpreter; - contentPath = content; - }) '' - # On darwin a script cannot be used as an interpreter in a shebang but - # there doesn't seem to be a limit to the size of shebang and multiple - # arguments to the interpreter are allowed. - if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter - then - wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) - # Get first word from the line (note: xargs echo remove leading spaces) - wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1) + # Writers for scripts + scriptWriters = callPackages ./scripts.nix { }; - if isScript $wrapperInterpreter - then - echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported." - exit 1 - fi - - # This should work as long as wrapperInterpreter is a shell, which is - # the case for programs wrapped with makeWrapper, like - # python3.withPackages etc. - interpreterLine="$wrapperInterpreterLine $interpreter" - else - interpreterLine=$interpreter - fi - - echo "#! $interpreterLine" > $out - cat "$contentPath" >> $out - ${optionalString (check != "") '' - ${check} $out - ''} - chmod +x $out - ${optionalString (types.path.check nameOrPath) '' - mv $out tmp - mkdir -p $out/$(dirname "${nameOrPath}") - mv tmp $out/${nameOrPath} - ''} - ''; - - # Base implementation for compiled executables. - # Takes a compile script, which in turn takes the name as an argument. - # - # Examples: - # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } - makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: - assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); - assert lib.or (types.path.check content) (types.str.check content); - let - name = last (builtins.split "/" nameOrPath); - in - pkgs.runCommand name ((if (types.str.check content) then { - inherit content; - passAsFile = [ "content" ]; - } else { - contentPath = content; - }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { - # post-link-hook expects codesign_allocate to be in PATH - # https://github.com/NixOS/nixpkgs/issues/154203 - # https://github.com/NixOS/nixpkgs/issues/148189 - nativeBuildInputs = [ stdenv.cc.bintools ]; - }) '' - ${compileScript} - ${lib.optionalString strip - "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"} - # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid - # mach-o executables from the get-go, but need to be corrected somehow - # which is done by fixupPhase. - ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"} - ${optionalString (types.path.check nameOrPath) '' - mv $out tmp - mkdir -p $out/$(dirname "${nameOrPath}") - mv tmp $out/${nameOrPath} - ''} - ''; - - # Like writeScript but the first line is a shebang to bash - # - # Example: - # writeBash "example" '' - # echo hello world - # '' - writeBash = makeScriptWriter { - interpreter = "${pkgs.bash}/bin/bash"; - }; - - # Like writeScriptBin but the first line is a shebang to bash - writeBashBin = name: - writeBash "/bin/${name}"; - - # Like writeScript but the first line is a shebang to dash - # - # Example: - # writeDash "example" '' - # echo hello world - # '' - writeDash = makeScriptWriter { - interpreter = "${pkgs.dash}/bin/dash"; - }; - - # Like writeScriptBin but the first line is a shebang to dash - writeDashBin = name: - writeDash "/bin/${name}"; - - # Like writeScript but the first line is a shebang to fish - # - # Example: - # writeFish "example" '' - # echo hello world - # '' - writeFish = makeScriptWriter { - interpreter = "${pkgs.fish}/bin/fish --no-config"; - check = "${pkgs.fish}/bin/fish --no-config --no-execute"; # syntax check only - }; - - # Like writeScriptBin but the first line is a shebang to fish - writeFishBin = name: - writeFish "/bin/${name}"; - - # writeHaskell takes a name, an attrset with libraries and haskell version (both optional) - # and some haskell source code and returns an executable. - # - # Example: - # writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' - # import Acme.Missiles - # - # main = launchMissiles - # ''; - writeHaskell = name: { - libraries ? [], - ghc ? pkgs.ghc, - ghcArgs ? [], - threadedRuntime ? true, - strip ? true - }: - let - appendIfNotSet = el: list: if elem el list then list else list ++ [ el ]; - ghcArgs' = if threadedRuntime then appendIfNotSet "-threaded" ghcArgs else ghcArgs; - - in makeBinWriter { - compileScript = '' - cp $contentPath tmp.hs - ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs - mv tmp $out - ''; - inherit strip; - } name; - - # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) - writeHaskellBin = name: - writeHaskell "/bin/${name}"; - - writeRust = name: { - rustc ? pkgs.rustc, - rustcArgs ? [], - strip ? true - }: - let - darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; - in - makeBinWriter { - compileScript = '' - cp "$contentPath" tmp.rs - PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs - ''; - inherit strip; - } name; - - writeRustBin = name: - writeRust "/bin/${name}"; - - # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and - # returns an executable - # - # Example: - # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' - # var UglifyJS = require("uglify-js"); - # var code = "function add(first, second) { return first + second; }"; - # var result = UglifyJS.minify(code); - # console.log(result.code); - # '' - writeJS = name: { libraries ? [] }: content: - let - node-env = pkgs.buildEnv { - name = "node"; - paths = libraries; - pathsToLink = [ - "/lib/node_modules" - ]; - }; - in writeDash name '' - export NODE_PATH=${node-env}/lib/node_modules - exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content} "$@" - ''; - - # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin) - writeJSBin = name: - writeJS "/bin/${name}"; - - awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" '' - awk -f - {sub(/^[ \t]+/,"");idx=0} - /\{/{ctx++;idx=1} - /\}/{ctx--} - {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} - ''; - - writeNginxConfig = name: text: pkgs.runCommandLocal name { - inherit text; - passAsFile = [ "text" ]; - nativeBuildInputs = [ gixy ]; - } /* sh */ '' - # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 - awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out - gixy $out - ''; - - # writePerl takes a name an attributeset with libraries and some perl sourcecode and - # returns an executable - # - # Example: - # writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } '' - # use boolean; - # print "Howdy!\n" if true; - # '' - writePerl = name: { libraries ? [] }: - makeScriptWriter { - interpreter = "${pkgs.perl.withPackages (p: libraries)}/bin/perl"; - } name; - - # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) - writePerlBin = name: - writePerl "/bin/${name}"; - - # makePythonWriter takes python and compatible pythonPackages and produces python script writer, - # which validates the script with flake8 at build time. If any libraries are specified, - # python.withPackages is used as interpreter, otherwise the "bare" python is used. - makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [] }: - let - ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; - in - makeScriptWriter { - interpreter = - if libraries == [] - then python.interpreter - else (python.withPackages (ps: libraries)).interpreter - ; - check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' - exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" - ''); - } name; - - # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and - # returns an executable - # - # Example: - # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' - # from enum import Enum - # - # class Test(Enum): - # a = "success" - # - # print Test.a - # '' - writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages; - - # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) - writePyPy2Bin = name: - writePyPy2 "/bin/${name}"; - - # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and - # returns an executable - # - # Example: - # writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } '' - # import yaml - # - # y = yaml.load(""" - # - test: success - # """) - # print(y[0]['test']) - # '' - writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages buildPackages.python3Packages; - - # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin) - writePython3Bin = name: - writePython3 "/bin/${name}"; - - # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and - # returns an executable - # - # Example: - # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' - # import yaml - # - # y = yaml.load(""" - # - test: success - # """) - # print(y[0]['test']) - # '' - writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages; - - # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) - writePyPy3Bin = name: - writePyPy3 "/bin/${name}"; - - - makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: - let - fname = last (builtins.split "/" nameOrPath); - path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; - _nugetDeps = mkNugetDeps { name = "${fname}-nuget-deps"; nugetDeps = libraries; }; - - nuget-source = mkNugetSource { - name = "${fname}-nuget-source"; - description = "A Nuget source with the dependencies for ${fname}"; - deps = [ _nugetDeps ]; - }; - - fsi = writeBash "fsi" '' - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - script="$1"; shift - ${dotnet-sdk}/bin/dotnet fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" - ''; - - in content: writers.makeScriptWriter { - interpreter = fsi; - } path - '' - #i "nuget: ${nuget-source}/lib" - ${ content } - exit 0 - ''; - - writeFSharp = - makeFSharpWriter {}; - - writeFSharpBin = name: - writeFSharp "/bin/${name}"; - -}; + writers = scriptWriters // dataWriters; in writers // (aliases writers) diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix new file mode 100644 index 00000000000..7fc47fbcdf9 --- /dev/null +++ b/pkgs/build-support/writers/scripts.nix @@ -0,0 +1,374 @@ +{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: +let + inherit (lib) + concatMapStringsSep + elem + escapeShellArg + last + optionalString + stringLength + strings + types + ; +in +rec { + # Base implementation for non-compiled executables. + # Takes an interpreter, for example `${pkgs.bash}/bin/bash` + # + # Examples: + # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; } + # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" + makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: + assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); + assert lib.or (types.path.check content) (types.str.check content); + let + name = last (builtins.split "/" nameOrPath); + in + + pkgs.runCommandLocal name (if (types.str.check content) then { + inherit content interpreter; + passAsFile = [ "content" ]; + } else { + inherit interpreter; + contentPath = content; + }) '' + # On darwin a script cannot be used as an interpreter in a shebang but + # there doesn't seem to be a limit to the size of shebang and multiple + # arguments to the interpreter are allowed. + if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter + then + wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) + # Get first word from the line (note: xargs echo remove leading spaces) + wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1) + + if isScript $wrapperInterpreter + then + echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported." + exit 1 + fi + + # This should work as long as wrapperInterpreter is a shell, which is + # the case for programs wrapped with makeWrapper, like + # python3.withPackages etc. + interpreterLine="$wrapperInterpreterLine $interpreter" + else + interpreterLine=$interpreter + fi + + echo "#! $interpreterLine" > $out + cat "$contentPath" >> $out + ${optionalString (check != "") '' + ${check} $out + ''} + chmod +x $out + ${optionalString (types.path.check nameOrPath) '' + mv $out tmp + mkdir -p $out/$(dirname "${nameOrPath}") + mv tmp $out/${nameOrPath} + ''} + ''; + + # Base implementation for compiled executables. + # Takes a compile script, which in turn takes the name as an argument. + # + # Examples: + # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } + makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: + assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); + assert lib.or (types.path.check content) (types.str.check content); + let + name = last (builtins.split "/" nameOrPath); + in + pkgs.runCommand name ((if (types.str.check content) then { + inherit content; + passAsFile = [ "content" ]; + } else { + contentPath = content; + }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + # post-link-hook expects codesign_allocate to be in PATH + # https://github.com/NixOS/nixpkgs/issues/154203 + # https://github.com/NixOS/nixpkgs/issues/148189 + nativeBuildInputs = [ stdenv.cc.bintools ]; + }) '' + ${compileScript} + ${lib.optionalString strip + "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"} + # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid + # mach-o executables from the get-go, but need to be corrected somehow + # which is done by fixupPhase. + ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"} + ${optionalString (types.path.check nameOrPath) '' + mv $out tmp + mkdir -p $out/$(dirname "${nameOrPath}") + mv tmp $out/${nameOrPath} + ''} + ''; + + # Like writeScript but the first line is a shebang to bash + # + # Example: + # writeBash "example" '' + # echo hello world + # '' + writeBash = makeScriptWriter { + interpreter = "${pkgs.bash}/bin/bash"; + }; + + # Like writeScriptBin but the first line is a shebang to bash + writeBashBin = name: + writeBash "/bin/${name}"; + + # Like writeScript but the first line is a shebang to dash + # + # Example: + # writeDash "example" '' + # echo hello world + # '' + writeDash = makeScriptWriter { + interpreter = "${pkgs.dash}/bin/dash"; + }; + + # Like writeScriptBin but the first line is a shebang to dash + writeDashBin = name: + writeDash "/bin/${name}"; + + # Like writeScript but the first line is a shebang to fish + # + # Example: + # writeFish "example" '' + # echo hello world + # '' + writeFish = makeScriptWriter { + interpreter = "${pkgs.fish}/bin/fish --no-config"; + check = "${pkgs.fish}/bin/fish --no-config --no-execute"; # syntax check only + }; + + # Like writeScriptBin but the first line is a shebang to fish + writeFishBin = name: + writeFish "/bin/${name}"; + + # writeHaskell takes a name, an attrset with libraries and haskell version (both optional) + # and some haskell source code and returns an executable. + # + # Example: + # writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' + # import Acme.Missiles + # + # main = launchMissiles + # ''; + writeHaskell = name: { + libraries ? [], + ghc ? pkgs.ghc, + ghcArgs ? [], + threadedRuntime ? true, + strip ? true + }: + let + appendIfNotSet = el: list: if elem el list then list else list ++ [ el ]; + ghcArgs' = if threadedRuntime then appendIfNotSet "-threaded" ghcArgs else ghcArgs; + + in makeBinWriter { + compileScript = '' + cp $contentPath tmp.hs + ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs + mv tmp $out + ''; + inherit strip; + } name; + + # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) + writeHaskellBin = name: + writeHaskell "/bin/${name}"; + + writeRust = name: { + rustc ? pkgs.rustc, + rustcArgs ? [], + strip ? true + }: + let + darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; + in + makeBinWriter { + compileScript = '' + cp "$contentPath" tmp.rs + PATH=${lib.makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs + ''; + inherit strip; + } name; + + writeRustBin = name: + writeRust "/bin/${name}"; + + # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and + # returns an executable + # + # Example: + # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' + # var UglifyJS = require("uglify-js"); + # var code = "function add(first, second) { return first + second; }"; + # var result = UglifyJS.minify(code); + # console.log(result.code); + # '' + writeJS = name: { libraries ? [] }: content: + let + node-env = pkgs.buildEnv { + name = "node"; + paths = libraries; + pathsToLink = [ + "/lib/node_modules" + ]; + }; + in writeDash name '' + export NODE_PATH=${node-env}/lib/node_modules + exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content} "$@" + ''; + + # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin) + writeJSBin = name: + writeJS "/bin/${name}"; + + awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" '' + awk -f + {sub(/^[ \t]+/,"");idx=0} + /\{/{ctx++;idx=1} + /\}/{ctx--} + {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} + ''; + + writeNginxConfig = name: text: pkgs.runCommandLocal name { + inherit text; + passAsFile = [ "text" ]; + nativeBuildInputs = [ gixy ]; + } /* sh */ '' + # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 + awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out + gixy $out + ''; + + # writePerl takes a name an attributeset with libraries and some perl sourcecode and + # returns an executable + # + # Example: + # writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } '' + # use boolean; + # print "Howdy!\n" if true; + # '' + writePerl = name: { libraries ? [] }: + makeScriptWriter { + interpreter = "${pkgs.perl.withPackages (p: libraries)}/bin/perl"; + } name; + + # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) + writePerlBin = name: + writePerl "/bin/${name}"; + + # makePythonWriter takes python and compatible pythonPackages and produces python script writer, + # which validates the script with flake8 at build time. If any libraries are specified, + # python.withPackages is used as interpreter, otherwise the "bare" python is used. + makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [] }: + let + ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; + in + makeScriptWriter { + interpreter = + if libraries == [] + then python.interpreter + else (python.withPackages (ps: libraries)).interpreter + ; + check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' + exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" + ''); + } name; + + # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and + # returns an executable + # + # Example: + # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' + # from enum import Enum + # + # class Test(Enum): + # a = "success" + # + # print Test.a + # '' + writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages; + + # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) + writePyPy2Bin = name: + writePyPy2 "/bin/${name}"; + + # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and + # returns an executable + # + # Example: + # writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } '' + # import yaml + # + # y = yaml.load(""" + # - test: success + # """) + # print(y[0]['test']) + # '' + writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages buildPackages.python3Packages; + + # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin) + writePython3Bin = name: + writePython3 "/bin/${name}"; + + # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and + # returns an executable + # + # Example: + # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' + # import yaml + # + # y = yaml.load(""" + # - test: success + # """) + # print(y[0]['test']) + # '' + writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages; + + # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) + writePyPy3Bin = name: + writePyPy3 "/bin/${name}"; + + + makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: + let + fname = last (builtins.split "/" nameOrPath); + path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; + _nugetDeps = mkNugetDeps { name = "${fname}-nuget-deps"; nugetDeps = libraries; }; + + nuget-source = mkNugetSource { + name = "${fname}-nuget-source"; + description = "A Nuget source with the dependencies for ${fname}"; + deps = [ _nugetDeps ]; + }; + + fsi = writeBash "fsi" '' + export HOME=$NIX_BUILD_TOP/.home + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + script="$1"; shift + ${dotnet-sdk}/bin/dotnet fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" + ''; + + in content: makeScriptWriter { + interpreter = fsi; + } path + '' + #i "nuget: ${nuget-source}/lib" + ${ content } + exit 0 + ''; + + writeFSharp = + makeFSharpWriter {}; + + writeFSharpBin = name: + writeFSharp "/bin/${name}"; + +} diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 561c3e4ab00..2411f8c03a7 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -12,29 +12,62 @@ }: with writers; let + expectSuccess = test: + runCommand "run-${test.name}" {} '' + if [[ "$(${test})" != success ]]; then + echo 'test ${test.name} failed' + exit 1 + fi - bin = { - bash = writeBashBin "test-writers-bash-bin" '' - if [[ "test" == "test" ]]; then echo "success"; fi + touch $out ''; - dash = writeDashBin "test-writers-dash-bin" '' - test '~' = '~' && echo 'success' + expectSuccessBin = test: + runCommand "run-${test.name}" {} '' + if [[ "$(${lib.getExe test})" != success ]]; then + echo 'test ${test.name} failed' + exit 1 + fi + + touch $out ''; - fish = writeFishBin "test-writers-fish-bin" '' + expectDataEqual = { file, expected }: + let + expectedFile = writeText "${file.name}-expected" expected; + in + runCommand "run-${file.name}" {} '' + if ! diff -u ${file} ${expectedFile}; then + echo 'test ${file.name} failed' + exit 1 + fi + + touch $out + ''; +in +lib.recurseIntoAttrs { + bin = lib.recurseIntoAttrs { + bash = expectSuccessBin (writeBashBin "test-writers-bash-bin" '' + if [[ "test" == "test" ]]; then echo "success"; fi + ''); + + dash = expectSuccessBin (writeDashBin "test-writers-dash-bin" '' + test '~' = '~' && echo 'success' + ''); + + fish = expectSuccessBin (writeFishBin "test-writers-fish-bin" '' if test "test" = "test" echo "success" end - ''; + ''); - rust = writeRustBin "test-writers-rust-bin" {} '' + rust = expectSuccessBin (writeRustBin "test-writers-rust-bin" {} '' fn main(){ println!("success") } - ''; + ''); - haskell = writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = expectSuccessBin (writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -44,9 +77,9 @@ let main = case int of 18871 -> putStrLn $ id "success" _ -> print "fail" - ''; + ''); - js = writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } '' + js = expectSuccessBin (writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -54,59 +87,57 @@ let } else { console.log('fail') } - ''; + ''); - perl = writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } '' + perl = expectSuccessBin (writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; - ''; + ''); - pypy2 = writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } '' + pypy2 = expectSuccessBin (writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } '' from enum import Enum - class Test(Enum): a = "success" - print Test.a - ''; + ''); - python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = expectSuccessBin (writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); - pypy3 = writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } '' + pypy3 = expectSuccessBin (writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); }; - simple = { - bash = writeBash "test-writers-bash" '' + simple = lib.recurseIntoAttrs { + bash = expectSuccess (writeBash "test-writers-bash" '' if [[ "test" == "test" ]]; then echo "success"; fi - ''; + ''); - dash = writeDash "test-writers-dash" '' + dash = expectSuccess (writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' - ''; + ''); - fish = writeFish "test-writers-fish" '' + fish = expectSuccess (writeFish "test-writers-fish" '' if test "test" = "test" echo "success" end - ''; + ''); - haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = expectSuccess (writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -116,9 +147,9 @@ let main = case int of 18871 -> putStrLn $ id "success" _ -> print "fail" - ''; + ''); - js = writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } '' + js = expectSuccess (writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -126,43 +157,41 @@ let } else { console.log('fail') } - ''; + ''); - perl = writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } '' + perl = expectSuccess (writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; - ''; + ''); - pypy2 = writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } '' + pypy2 = expectSuccess (writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } '' from enum import Enum - class Test(Enum): a = "success" - print Test.a - ''; + ''); - python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = expectSuccess (writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); - pypy3 = writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } '' + pypy3 = expectSuccess (writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); - fsharp = makeFSharpWriter { + fsharp = expectSuccess (makeFSharpWriter { libraries = { fetchNuGet }: [ (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) ]; @@ -183,31 +212,31 @@ let then "success" else "failed" |> printfn "%s" - ''; + ''); - pypy2NoLibs = writePyPy2 "test-writers-pypy2-no-libs" {} '' + pypy2NoLibs = expectSuccess (writePyPy2 "test-writers-pypy2-no-libs" {} '' print("success") - ''; + ''); - python3NoLibs = writePython3 "test-writers-python3-no-libs" {} '' + python3NoLibs = expectSuccess (writePython3 "test-writers-python3-no-libs" {} '' print("success") - ''; + ''); - pypy3NoLibs = writePyPy3 "test-writers-pypy3-no-libs" {} '' + pypy3NoLibs = expectSuccess (writePyPy3 "test-writers-pypy3-no-libs" {} '' print("success") - ''; + ''); - fsharpNoNugetDeps = writeFSharp "test-writers-fsharp-no-nuget-deps" '' + fsharpNoNugetDeps = expectSuccess (writeFSharp "test-writers-fsharp-no-nuget-deps" '' printfn "success" - ''; + ''); }; - - path = { - bash = writeBash "test-writers-bash-path" (writeText "test" '' + path = lib.recurseIntoAttrs { + bash = expectSuccess (writeBash "test-writers-bash-path" (writeText "test" '' if [[ "test" == "test" ]]; then echo "success"; fi - ''); - haskell = writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' + '')); + + haskell = expectSuccess (writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' import Data.Default int :: Int @@ -217,26 +246,27 @@ let main = case int of 18871 -> putStrLn $ id "success" _ -> print "fail" - ''); + '')); }; - writeTest = expectedValue: name: test: - writeDash "run-${name}" '' - if test "$(${test})" != "${expectedValue}"; then - echo 'test ${test} failed' - exit 1 - fi - ''; - -in runCommand "test-writers" { - passthru = { inherit writeTest bin simple path; }; - meta.platforms = lib.platforms.all; -} '' - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues simple)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues path)} - - echo 'nix-writers successfully tested' >&2 - touch $out -'' - + data = { + json = expectDataEqual { + file = writeJSON "data.json" { hello = "world"; }; + expected = '' + { + "hello": "world" + } + ''; + }; + + toml = expectDataEqual { + file = writeTOML "data.toml" { hello = "world"; }; + expected = "hello = 'world'\n"; + }; + + yaml = expectDataEqual { + file = writeYAML "data.yaml" { hello = "world"; }; + expected = "hello: world\n"; + }; + }; +} diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 4f74f7d2d69..192599c7e98 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.21.0"; + version = "1.22.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-rKkL5rZw9dUlnNWrHRicvHyDOM8VG3i3crHIJpJUejc="; + hash = "sha256-IB+YQcIpxYumJ5ETezqQ2yVlvdh+wllJ+MkVHPWZCEg="; }; installPhase = '' @@ -16,6 +16,8 @@ stdenvNoCC.mkDerivation rec { install -Dm644 *.otf -t $out/share/fonts/opentype install -Dm644 *.bdf -t $out/share/fonts/misc install -Dm644 *.otb -t $out/share/fonts/misc + install -Dm644 *.woff -t $out/share/fonts/woff + install -Dm644 *.woff2 -t $out/share/fonts/woff2 runHook postInstall ''; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 719a9d0224c..7e7a1ad33eb 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "25.0.1"; + version = "25.1.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 2271d496d15..6e15d96a10d 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "25.1.0"; + version = "25.1.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-hxkdigJYP0bPn1+HWlq7DoL/jTYAO1WCJcQN2WI8j/U="; + hash = "sha256-IEP4xxL5rez15FVCKdgNBmCv9yHFqtHz/YKTQciQWMg="; }; - npmDepsHash = "sha256-zIH2rt+uhYO1pwumu6LeIpKX1y4y9ajwxK/vAVwzz9Q="; + npmDepsHash = "sha256-E4dC3WCXvnx9qUxOM+f6/HfBxKhUvsD9TEVmPJGwbDs="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index aec3f2d2894..7c3e2686ea9 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0lmr4xqmyr4pz1xz0iw71zjwa9xn0nbkzxr1q3mdv3x12pdp0r11"; - iosevka-aile = "1l4bmn1cangjn91rq2w40np6dkcw34l8yvfbsqpmbzfqsz34ga61"; - iosevka-curly = "1sp8ig31s8rq91vl2ziv3ixqh50qdvnnlx6fjiccyxza079kxjw0"; - iosevka-curly-slab = "08jmmshflmhwwaa184aggxbmwfj4q1czynl52cz1may3cgvjr9za"; - iosevka-etoile = "1zvd8n7vm5za2jlply796hvzar92g73ibkhdc4r8d38148xxmwp2"; - iosevka-slab = "1xfrs95d1dzjz9dlgyn49xryyjzm711frxi45931l6i2jxppgz74"; - iosevka-ss01 = "0q9q5vx4p1r29l404yadbi4qslrjzgkisk6hk04xrhhrmkhh4b5j"; - iosevka-ss02 = "1nd7lyjcciirq146lj9crxrbxp82q29lclbhmxvkszlymif36vr5"; - iosevka-ss03 = "1rkgqhbh3c77jzysn0hdci2lgw1ss0f98zdnc2xfwhzimhlcsb2n"; - iosevka-ss04 = "17dcgbjhvyjcmk4jzf55faqwb30inhx98qldpjx66rkjg274dady"; - iosevka-ss05 = "1prpxj9hphhpmjpn001gznwmphijv4fkd1m5yr6zyyq10zyawx1j"; - iosevka-ss06 = "0narnyrfk88rclgm1caaqd7rmisbviizzrp4g54naxsmwhxj6zvd"; - iosevka-ss07 = "00v615vs6kmnxv7zql04b01dxc0ngdkpin51qi8fdld1nwy3gw4j"; - iosevka-ss08 = "1rzjpp82s2y2zybyh20406c131wk1mfazc4fzc766an87gip8409"; - iosevka-ss09 = "0amq785n58f1f92vi7xv4zsx91v5a3rkksk5yifysnc6pkxjs56w"; - iosevka-ss10 = "062x74l5df1ahxb7a27nrya6nh49dl0pi5c88v78hi2m85baviar"; - iosevka-ss11 = "06ak3wlxf472vpl5z02fg92z4hiycxvqj411g9cpfz7kg6y006fb"; - iosevka-ss12 = "1jny1y27swpzm2cqbavkkkbi3k1v2z2hy17l9arr9dv54bnm2d57"; - iosevka-ss13 = "0aylmsnhbrjckj012s7j6x0gikldiln60grjnp4h1z80nhs6md3a"; - iosevka-ss14 = "0j6v8bihckwp0bhs80zwr1rsrdf4bhaqjzwjx2mr9d63dnhj5lp9"; - iosevka-ss15 = "0xs52nbmj1g43x943vvb4pnms1i98ffidkad79f63nhw0x0ygr01"; - iosevka-ss16 = "0p9g432d44rdiv9bs5z0irdamqsknsi82snxyrmjplgy7m1frv9k"; - iosevka-ss17 = "1bvc9782yry9klkinfwrbn59mclcpizmv3yndz4b1ixv8dgym65z"; - iosevka-ss18 = "1a4m0drdg4f3rpxcjm899rzpym2m0hhiypwg61506nww1jcl8kk8"; - sgr-iosevka = "1xwpg3cq2587m8az2sfpd0k3pmvd8w4ci1jl7717fap38drl86ba"; - sgr-iosevka-aile = "0qjds4jhdzgnar0xdbz315kb2f4hxgh6xi8sdqpfbg84wjaj9872"; - sgr-iosevka-curly = "1qxyncllbbi1pcq7ajq63127k4q119cag76yyh3xpwl2f235ybrx"; - sgr-iosevka-curly-slab = "1bp44hgmc81avvpwdckjkmh049igfdfppnmmmpxmy55xzpmy30ik"; - sgr-iosevka-etoile = "0jvnlrz7mxrm0lg7wkdh3pz529xmssw63rgi0nfdy77zga3gv8r4"; - sgr-iosevka-fixed = "0bqdfq1xaanqpv1s9skapch184hcvbmdpcnjh7skms5ggcal7s3n"; - sgr-iosevka-fixed-curly = "0a7agrgi4qi3dk8yix3p9kbjvyqbxvm4lc0b75ywa8330g42khf5"; - sgr-iosevka-fixed-curly-slab = "0kxgkhvhz4l7ifc591c1n112wkcimfl417p49s3k5rx19yadz3rv"; - sgr-iosevka-fixed-slab = "1aq7qc6jjm7wkd5ng937gbv5l82gqx9snm4ffpp2k5zk8nnm38lv"; - sgr-iosevka-fixed-ss01 = "12gfppvi8vfp6y6y96zd6yvpb8xlr907gzhz04vm3j9m2dx8mdpz"; - sgr-iosevka-fixed-ss02 = "1ip6yx99rfa09bx64ah8bk5jp8w0x1qsdjknda7fwd8n1ian9qb1"; - sgr-iosevka-fixed-ss03 = "0cbayci1j0qj0xbydkxl4g8p4rdhjpdkjy6vb5zsxrx8rcxzmh6r"; - sgr-iosevka-fixed-ss04 = "1nm1wbax6xlxhsnw3522wi9dzzzr8k92464p9w31krrajlji46bn"; - sgr-iosevka-fixed-ss05 = "0y68rh0352idl0ncmx0lngbc6jj98incsnlh8xn55qggawah2g7l"; - sgr-iosevka-fixed-ss06 = "0x4azqmmznzaimg3ahv8kl0zcl3bdmrq4lqrvy94qz5ivgfnr7zv"; - sgr-iosevka-fixed-ss07 = "1l29i7q8zyw4cz21dqz2bc74c60grmmasiy3l31awrbwmabncqms"; - sgr-iosevka-fixed-ss08 = "1zlfqrkbsysi2nzfmvmz4yfbjngx3wpi3c68b4nkd8wdabll7a4m"; - sgr-iosevka-fixed-ss09 = "1631yavmr59lvmqhp3940n19200zsphy2fvq9kdg0xnrr9hgcgk0"; - sgr-iosevka-fixed-ss10 = "131crnfgvhxakggmvgk6apji8w3wkbgzm9ma77sz9ib9hcfrcn1f"; - sgr-iosevka-fixed-ss11 = "1gwz51ck1jdfww1g2yxzrjhyl3i41mqm6cykm2587r9kr5igxbyq"; - sgr-iosevka-fixed-ss12 = "198v6chwk948q7yikv06s4lydhyg4vq4s6ssl4fvay7d7jg33s5j"; - sgr-iosevka-fixed-ss13 = "1fg77lzw05qijap03l8f5k5lmfrn6phxpswvmzvlzzdscb5f2f3a"; - sgr-iosevka-fixed-ss14 = "1rhlja6vl1rdgp3r1ls3ycdr19x4bb0azyras7pamv2g5wbcrzv8"; - sgr-iosevka-fixed-ss15 = "03i2cr65368w8naqqyvhmry2sphihcdy3vw7pbq2mknn1ygrhafp"; - sgr-iosevka-fixed-ss16 = "1zxjik8z4jmq73fwfzg3y74wfp8a4yiy1dvm5g73b1r3jjc413dz"; - sgr-iosevka-fixed-ss17 = "0hxsa0bkf6yfh4hvs3h83myp3iil40c0629biys6h5a79nvqgxpr"; - sgr-iosevka-fixed-ss18 = "1zrnzrrzv1iw1aqa24khcxpwsg8fhvcbbs71j91j7yp5s070szar"; - sgr-iosevka-slab = "1d9lffq7xd6liglrr8kcymkq2bkvnz9cxnq4m5bby5h48vxr72j5"; - sgr-iosevka-ss01 = "1aa36415rpn4ihsd43mj1pgsjsiy4y2wr4ybckjyg7av1wi0n0rs"; - sgr-iosevka-ss02 = "0khj2j30q5zdygabmx45wn20g140zafifyg93fk9zp0ivs7xm13g"; - sgr-iosevka-ss03 = "0qvhlqc51bislhdhs61vv21dw0rvvf5sg9m7zk81d74harxba0qz"; - sgr-iosevka-ss04 = "0zpx6dpgivmk4gnf5w17978pd7cpq0f4j7ly53ykwa6ngjwq7cxq"; - sgr-iosevka-ss05 = "0jsaf52jydp4hah5q8l7sky1d7j3amkj7hs08qraw1h4bxbhqdq2"; - sgr-iosevka-ss06 = "0yh39c3bb59imysb0jyb0w006lhf5627ck4lkbv3pffa3jaskfrm"; - sgr-iosevka-ss07 = "1pm7pml2y9hfl8xpf0ggprvzc9yqxf2dpi64zsrbh950d41wmxyj"; - sgr-iosevka-ss08 = "11dqssnw6bhvsplc4sd8jvwhnmk6k8f506m8j26v2gr5iqk773kj"; - sgr-iosevka-ss09 = "014182zym2rw5zakpjaf921mpvxlr6ic24ag09c79c0w9mi2jnff"; - sgr-iosevka-ss10 = "0wzfxrhx173yga3s1ln1709wwxf4hbqym4sdg9jz3dn2hdn1f55j"; - sgr-iosevka-ss11 = "0wh1dy6w3sgw9xw2nda0xpa931v66nxv4kd4q4s8r9g6s5kbpj35"; - sgr-iosevka-ss12 = "1dnh7gs5lyyc4n7jmnl6c9qcsj7fnhzlyy8kxmsgn5hxfzjn42i8"; - sgr-iosevka-ss13 = "0g47da6ah2skrxs522q9w3aamrpyfhixg9cpqy0sgyxraw2iaq3d"; - sgr-iosevka-ss14 = "1if7hs8wjw7fs0j46camazmc93p0z1hz43i0rrkjxnai6cjqkaqj"; - sgr-iosevka-ss15 = "05h5yzpzx9xlf8xwkw8inp16x0arpdcfrklc62qdi87mdnfpkw8w"; - sgr-iosevka-ss16 = "01d3w7yblfbca3l2cmazh72f5a0z3wnb5d77rlw9wlvgw0drj8b0"; - sgr-iosevka-ss17 = "0sl94iaw038kljr78ms42vjqyj55pbyslxbm0b81fg6xkjy6q60n"; - sgr-iosevka-ss18 = "17395mrpjz1rmh5661s1v1ja53qhygf3zalqabya7cwfb1hz0xqy"; - sgr-iosevka-term = "10zg4365w5f554zdcdq4h7ixq3aq1lm21qndffp4q5c0kv57ggak"; - sgr-iosevka-term-curly = "19lkavcwpy7hsgmxz2jwlvbx9lsi8wm3xrypcb0wbcy80hjgkms2"; - sgr-iosevka-term-curly-slab = "1asdfglxskg6cikhhxx83jpwqsq3adrb5zgk94h1m2sv2xpcd65i"; - sgr-iosevka-term-slab = "0rsl048jzbf4fwindxxrlb2fwivjjayydc3fs8v92xg239y45m35"; - sgr-iosevka-term-ss01 = "17hin55idhzvcvrpvgpgjwkn29zsckmvjygbsjf560vy3cv48nlg"; - sgr-iosevka-term-ss02 = "0xnr89bdifbydgy7xbkg1msqxyjxp7l0rxby19bayd6f5lyh552s"; - sgr-iosevka-term-ss03 = "1ijz7qjym1fdrrjyi4g7lkl75frbcyh5ds548szwdavffh9ad74d"; - sgr-iosevka-term-ss04 = "1xrmlsp0gggqzgqckgp5r3h445xyglqid2g6f0fblcv5a79kp04w"; - sgr-iosevka-term-ss05 = "1d4llq2g6s9pp3ajl9spca5bpkk24kba4ki847gi55i7lpw4d1kl"; - sgr-iosevka-term-ss06 = "1wbqsgng4r3b588lnip0li321ibrnc4i39jjmvrs9c8xmgzswfjg"; - sgr-iosevka-term-ss07 = "0jxq4ygc6afq4vfgzrpsvhdw52535yqk6702nb5frlf9bllxpali"; - sgr-iosevka-term-ss08 = "1hqs6j38sghi1v86l83rhkyl7frsph7dp9jnhmzzb6w70ikbmajx"; - sgr-iosevka-term-ss09 = "0h8cf76s7dsa6gfsf9sxiri98d8crsdq2a2cjmn5iz9cxwnnrf0h"; - sgr-iosevka-term-ss10 = "0p3643d444r03y74djhpmgdz4f6ydwkhddgw4fpjhx4sg226yvfc"; - sgr-iosevka-term-ss11 = "0ak3w6h58wnpcxahdmdij52izvlq49allvrlq1syziaqd6b95qpz"; - sgr-iosevka-term-ss12 = "0km4sfg4q1z6b999piiiaiv6qxnvanw1s0jgrvy933fxyv7n4h7a"; - sgr-iosevka-term-ss13 = "0xhimnsspan0mcmspvz1r412q4rzririjnj744mgxs339w1bi6bh"; - sgr-iosevka-term-ss14 = "0h1v4lvf367p7w5m8s3mncp2ssfncxrixn1grj1nigijdc53m7ws"; - sgr-iosevka-term-ss15 = "1pppczbfv0dh7dnf39rw23qmr1h8ixkgw3gc6yashjni0jd9rr3r"; - sgr-iosevka-term-ss16 = "06fradackj5xi8j79sv16mnrxv91s596n04w6l3s29dcsmahf3yv"; - sgr-iosevka-term-ss17 = "0g4pv6v09n0xpxai3i79bhjspabvadv4wd4r1ryms6jyfdn9n367"; - sgr-iosevka-term-ss18 = "00zv631z48ifkpaw4idr9r6q2zdjv7m7i19xb33gv8yvfv96s3hz"; + iosevka = "1qs8z085mwg3ay0pn2b7ka21cb4xd1hf9yziiszajb94bkxwl77s"; + iosevka-aile = "12dg6s8bhx739y8slp2s783af3ysipdb640xl67v8jnznmj2vyg1"; + iosevka-curly = "1ypbfv41qvwpg7dc9hhsyqrnavd6926568rcnvj9j99j5dm8nl37"; + iosevka-curly-slab = "0r7n83ddq8w8ih6fsij7v9xkr8z5cvnfq6i921jsm0l5x03f7rxh"; + iosevka-etoile = "1gazc1vz54lgg3hxcqryh5nl1grlngpkph4l4i292k014ky32gf6"; + iosevka-slab = "02lgwmvzcpjz8n78vvxm7w7pff9s6008ca5i8fvl4m24k051jfdy"; + iosevka-ss01 = "07gir5wszdnzrh32978kwg8rhychkjjqqwhdgslrxjfwnlrzpjq3"; + iosevka-ss02 = "15sqkk0w39cj8lyjfhs70if7k1adgql18kkmyf3bx1h92xys18ca"; + iosevka-ss03 = "0gi3gm0byg8vhicgfxvcvja1cz9qs8ahryk9yn5896yiyps1djfa"; + iosevka-ss04 = "19l3g2vdms6nnyhpi5fjnsk0ym0b8ypa30riha1z8pkzhfk650gp"; + iosevka-ss05 = "1zl2mc0yxb4gwx47pzhcg8q8vk3k269sf8x2i6l4iki5qapi3436"; + iosevka-ss06 = "1d28ks82y74wyla8y7203bpdi6rz304glwmkbv2blfn3n4d5ncga"; + iosevka-ss07 = "1fw0n005b8lhy36qcy0a8flnv6y0mi7s4d9dx6gjbl1hsyykhppl"; + iosevka-ss08 = "1w0invhhwqy2braxm6n99g33l8sxdi0y5lbdxrhdypqrrg32bk2n"; + iosevka-ss09 = "1ai0r32s5y1sjsidxal1ah5bj6agh33ljiklnjs3ni9f6kxcqbds"; + iosevka-ss10 = "1qwzzndnhivs3m7kk3izhyd07vb3zx7pankkq0vdxiynpais9pjy"; + iosevka-ss11 = "14nw87kcidm9hds4z0rw3c5alnilgzrkgrbxg7kvsb0xxvw2xlha"; + iosevka-ss12 = "0gpy6pmirsp69vyyq7v3cxvn5dyv5k740qs76a13n5x0lvvapjyj"; + iosevka-ss13 = "1gsggzar1kqk1mqncp7jry8pp8nmr9p2ip309dl6di4b4c6cfplh"; + iosevka-ss14 = "1km4a6jhjmwl4wmapfhshqvf64dc87bfi89n5m34x91qlnw1xmfw"; + iosevka-ss15 = "02pj2mhyx3j4md9v2n1kbr4b1cx84rc5fcggl9i718qwryh55bg5"; + iosevka-ss16 = "0a4nwl4am410nklvzmr66z5vmbmq2v243div3r73nkwx6qzn7g64"; + iosevka-ss17 = "1hmdhp87qy0q4wnrfnc5vrv0n8dfn3cnlmc6j817pazra5lv0b09"; + iosevka-ss18 = "12jhd998m976cz65y8r12jaiy6ybrzc0zxb1i9sl72k9c9qdsy87"; + sgr-iosevka = "16n0y3qa7914xv1x8md12hfv1fz1alfgj16lsxcb8zmp8phbswqd"; + sgr-iosevka-aile = "1dmyx30yq1avdnr7f9hz9mjyi4awd6k0sr4svmhxihr4lmvzabhn"; + sgr-iosevka-curly = "0mgyh6qf5c85z9j8kcnfzyzmak6pj9s6k2da0ggyrhv1iqsjnpai"; + sgr-iosevka-curly-slab = "0va38lmja77mnnyr3xzdqa37xv4cz7jf8hcxr1p21yhd681gznbg"; + sgr-iosevka-etoile = "1r6ai6ph5nbqxyrrzs945y02mcd4kdj2ckaadar4mlc8hwmdvdkx"; + sgr-iosevka-fixed = "0dwk1gvszq0d8x22fa57ka3l0n7c6yga2k2vdk2kpv9aq2rlb6p9"; + sgr-iosevka-fixed-curly = "11vwsdhkqwzmifx6snxffn503bli0ikqnhc12q1y4j8rccn7xyhz"; + sgr-iosevka-fixed-curly-slab = "06r4rl696250ny0jw9v8z13f10yp64g09kk8hpcm3rq9xwvfkra4"; + sgr-iosevka-fixed-slab = "1wi92bykv4v7dsnm6qbhh5ydy3mwzxwjkvmycvwjac64hpicj2as"; + sgr-iosevka-fixed-ss01 = "1nacy9lr64v0lfhq61b442b9fr1q14bchydbh33fvk7wnkydkfnl"; + sgr-iosevka-fixed-ss02 = "1cb55b07f339q6mbv1v5rqh37m3b4zhlzz2fg08h97xvb3vd7n7d"; + sgr-iosevka-fixed-ss03 = "1sjwndp4zmqjc95da9al24g5nzzlv7x9lsm9dljpcznfw88wrhsy"; + sgr-iosevka-fixed-ss04 = "07p9fv5aarwrbl9b9gbfwi26px53zfw14472jrasp10cl0dha12a"; + sgr-iosevka-fixed-ss05 = "1hvdnyibzkjd89vm6ir3bpskhi75ijjcbpr7y2iir6z7xj11mzmn"; + sgr-iosevka-fixed-ss06 = "1ram41z53w2khzhhf472a9qyhk3ikd180vnzvfasa0510c7fp2n0"; + sgr-iosevka-fixed-ss07 = "1kkbch8zx3dzacwhkqi6yxihf3w2g0kblhdicdfhqfb57pb63ka8"; + sgr-iosevka-fixed-ss08 = "1lw4917p842yp21m73n1k6inbdqacnqcrqr6f9995qvl9ls9l8qg"; + sgr-iosevka-fixed-ss09 = "033wyyxyza0lvq53gaaxy1r4f9li6rmvqdqw66jq2c5mr75xajs6"; + sgr-iosevka-fixed-ss10 = "0x0by1hbc6x89ac44x47bxn5r07znnsykhf8wx9dy82kj841h2wk"; + sgr-iosevka-fixed-ss11 = "10rlp2xl9509rhaccyy2asi95idddzvllnwgnlr3ny9n27a9bakn"; + sgr-iosevka-fixed-ss12 = "0jljdyya4mxxjcmfxr1q37cy95wi56swjryvn99m0d5sahim3y28"; + sgr-iosevka-fixed-ss13 = "0524p8xrhbn0vgbc2ls3l0hpkidkksxqysrjm9c10m9z88l46laj"; + sgr-iosevka-fixed-ss14 = "13gpnjh54583r1kl3ra3l36zmvg81kknij9a8jrgp27d3dad95wq"; + sgr-iosevka-fixed-ss15 = "1gmwckl83r9lfizsdc5f806vism27g54wwn849dhgp8ckpp8w3sp"; + sgr-iosevka-fixed-ss16 = "0r5r9gpjzws9j6z5a64j3sjfii7c28vshmly47rj5npgrzflanmf"; + sgr-iosevka-fixed-ss17 = "1yyx48liizjbprfh2pi74c26sqggvnya5ajx7gyg7z4nwgw8hirv"; + sgr-iosevka-fixed-ss18 = "0lcjcl33qsd6xmldqv4s46l9isjfgnv2xd61c71swag0qsqavwr9"; + sgr-iosevka-slab = "1hy9ldl53slr30zcpj1bz1nbcx2316yycmwmrrmd5pjbplbbm1kj"; + sgr-iosevka-ss01 = "1kxzidydpr8y0fxhzm892zpl1nk3a1xdpdcx3ndnkbj99rhqbkfv"; + sgr-iosevka-ss02 = "02fzavi20m00l4rg995811x97x7bnv5hgc6bfllqy5x7vwry2a0g"; + sgr-iosevka-ss03 = "0vb863m8gxy7iq7b4a9lmphn39pz1v46x131isqd2n1d06bbn80r"; + sgr-iosevka-ss04 = "0fv506x069bgcvrhyzqw1vmd9s553k8pixsgyqy86dn3gy7hdaxz"; + sgr-iosevka-ss05 = "1mk8f5kk41dpf16hf44ikb2a4hx9i7k1y9dnxnd3f2j8wwizg9mw"; + sgr-iosevka-ss06 = "1v0llv8s98fihim8ay01qv4jc5dyn0hcczh9m63ap733m5rsi97d"; + sgr-iosevka-ss07 = "1rbb6imadzlwrraa4y4bs967h4lz6jvxqjrlr6xgrc11ndb1zfng"; + sgr-iosevka-ss08 = "13h027413rsx8x9snmjq4d4apsxwgjx6nqxrr3ndm16w3qqv6hwx"; + sgr-iosevka-ss09 = "162m4rnad25gsgc80jvf9ipzxf32ls4pr5279ffypjglxb37vfmx"; + sgr-iosevka-ss10 = "1jywagwqna5sw4q7973g85fj93gbhzmbhhwnz56yziywc52nh050"; + sgr-iosevka-ss11 = "0y7fr7hd1gd6cbfhnfdbhxsa46i1mlh86qkp3397knjqx81i6mi0"; + sgr-iosevka-ss12 = "1hd9p48mg4i4h8agyc9wbss0870g76mr8b9cvzf9dpn2p3nf7s96"; + sgr-iosevka-ss13 = "1x6wvl2v8alqk3iybw05z8k8fwwv4j3si5f2308db9r9phhh5qj0"; + sgr-iosevka-ss14 = "1rgk6g80x6gllk5zkragsnlv38jyzlisjcc802xwpq163lvq135q"; + sgr-iosevka-ss15 = "010fqzcfv9i5z23wbd393vgwcy22am2ly3i44np2ihbkb47aq6v9"; + sgr-iosevka-ss16 = "01f8827cx7nhflrvw2qflz3ahb2a5fdl832x18vaz81qbgkrn9lj"; + sgr-iosevka-ss17 = "11z67iwj6njlg35wm35wx8wpx2vmg1w8pl3fhncm25vi245mjd9g"; + sgr-iosevka-ss18 = "1h7ggiqvc169fk66kmxfpgbpmh7949smlanjcxamicsdllrr1ib8"; + sgr-iosevka-term = "0bdshfvapw0c0l6jd2fbkyfz07nxjhi4hjvc8r18r8i1ij8ak4w7"; + sgr-iosevka-term-curly = "1smkblav040fh7jslqa20p9zprcan5cfb8q0bi767rrnmnwndxf7"; + sgr-iosevka-term-curly-slab = "07si1d5vly2q88hmws4fjaia3758dllhqjvbv67hyhfxrvr17nbg"; + sgr-iosevka-term-slab = "1kw395l5xs674y9g55074rvv4p24qvy61yvjvx9vs51h5il0cvp0"; + sgr-iosevka-term-ss01 = "11i2fymlaz841vc1m05ig6qr49sks1zymg3wi8a63gx8nq0m0c0d"; + sgr-iosevka-term-ss02 = "06nffhxmyzz1x28i4cmp5g6a07wm8f91715lngajgm6jzm168vgp"; + sgr-iosevka-term-ss03 = "1yrdaqdpcxx7d6cljlmna9zc9avsmv94156q9yg1q638rxj34kp6"; + sgr-iosevka-term-ss04 = "186s3b8zqid0yj6a0qwvi5pxnfw54yzs4vvw94apka0yl4857ipk"; + sgr-iosevka-term-ss05 = "177z1hlrk5agrsh2sn6xmggpq7xfjlh5nz4azi71nzg60c0k6312"; + sgr-iosevka-term-ss06 = "0l69ajjil23qr3p4xw0578nj666ry0q370fyzb0mv9jk3q9yv3yc"; + sgr-iosevka-term-ss07 = "0hr9ls5l6ik5i5j6kx6imr3m9ymdbnkf6gmvswlikw21q609nvxm"; + sgr-iosevka-term-ss08 = "11bs0swb8vz138yb91gx901r3cg0snz7334hbdl4nxsa8wrphrmw"; + sgr-iosevka-term-ss09 = "1279gxl2j81shnh6s85p6xgb651mn83f9g0dr0bic53gbqfjxs26"; + sgr-iosevka-term-ss10 = "1v0x771pk0qdpb50hsihqvzf0q8fgg9z8fliwjpgjfkzgx85fl95"; + sgr-iosevka-term-ss11 = "1jg92awghy3qgziw7shizc35pwdxnm6xi3ss4381xbcmg3vhr64j"; + sgr-iosevka-term-ss12 = "1jy5nq0zpv6bnxd4c5vi13p8p4fgsc3q6b4wbzq30hipq4ikq9ci"; + sgr-iosevka-term-ss13 = "1hnqmfz82a39myzw93pwx5jcv6hh626plysmsxv96qds3qyzz646"; + sgr-iosevka-term-ss14 = "181d1alrk0amdbpg96s0qgzmqgmgs248wmrmkrzzamj4r5a981qp"; + sgr-iosevka-term-ss15 = "1a0naw45cjq6pdizy9sqq0lqbv7aawy7cjy2mf98f5059hmarqr2"; + sgr-iosevka-term-ss16 = "1a5lby135y5l65fpz5fcd7hdf7xy7dmi8mrjc68ihb1b52p1vp99"; + sgr-iosevka-term-ss17 = "00m0f1infr6qgd7126szbp4xkz3x0wpnybwbchyf28rm3jrjcnrr"; + sgr-iosevka-term-ss18 = "0i0kp7jfwlb73dx44q8pfwpyzzn24hinfhaxnvf78dv2k9623q5a"; } diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/data/fonts/ruwudu/default.nix index 61f306c7102..025c0a2ece4 100644 --- a/pkgs/data/fonts/ruwudu/default.nix +++ b/pkgs/data/fonts/ruwudu/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "ruwudu"; - version = "2.000"; + version = "3.000"; src = fetchzip { url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; - hash = "sha256-FP+ZHm1fKlozAAI2PbJ4r4v5OwRxBtYMRLmRwPbqx2I="; + hash = "sha256-HuuH6AWD5gym73zSsuQdQD901J6r3PkUmUTtnRxYRyg="; }; installPhase = '' diff --git a/pkgs/data/icons/banana-cursor/default.nix b/pkgs/data/icons/banana-cursor/default.nix new file mode 100644 index 00000000000..b89213c6d6f --- /dev/null +++ b/pkgs/data/icons/banana-cursor/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation rec { + pname = "banana-cursor"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ful1e5"; + repo = "banana-cursor"; + rev = "v${version}"; + sha256 = "sha256-PI7381xf/GctQTnfcE0W3M3z2kqbX4VexMf17C61hT8="; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/icons + mv themes/Banana $out/share/icons + ''; + + meta = with lib; { + homepage = "https://github.com/ful1e5/banana-cursor"; + description = "The banana cursor theme"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ yrd ]; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index b06b6b35f37..daf8c441071 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.07.08"; + version = "23.07.21"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-JToou95HIrfqdT0IVh0colgGFXq3GR2D3FQU0Qc57Y4="; + sha256 = "sha256-QwbjJ38fWRkzd1nmsPWcwUQ7p96S/tGEvIfhLsOX1bg="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 6fd4a6641ce..d489c23c6b8 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -30,7 +30,7 @@ let ])); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.90"; + srcVersion = "3.92"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -45,7 +45,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; }; dontBuild = true; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index a7232c08ef3..79b8a10d7d0 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230717050659"; + version = "20230725085751"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-HmP5V02TUL48vlQ9bFRePV5l1J0ECszVzQ48UENDvuQ="; + hash = "sha256-4D975ASoDoXjEi0kkwsUIIT6nwOE3ggBzNUVp0ojsbQ="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 8077e29316a..2d7fd0c6c02 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { wrapGAppsHook gsettings-desktop-schemas gettext + gobject-introspection ]; buildInputs = [ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) - gobject-introspection gsettings-desktop-schemas gtk3 glib diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 5e736ea1fdc..e42e5a6069b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { xorg.libxkbfile xorg.libXext xorg.libXrandr - gobject-introspection ]; nativeBuildInputs = [ @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool pkg-config + gobject-introspection ]; postPatch = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 1b5dbeb8d08..444a6877866 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gobject-introspection ]; nativeBuildInputs = [ @@ -30,6 +29,7 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook pkg-config + gobject-introspection ]; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 6692aac628f..956a87773d6 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { libtool meson ninja + gobject-introspection ]; buildInputs = [ # from meson.build - gobject-introspection gtk3 glib diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 0c07b46822a..681d6afd4ea 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + gobject-introspection ]; buildInputs = [ - gobject-introspection cairo readline spidermonkey_102 diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index d3046830f01..c2ad10f97ac 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook xorgserver # for cvt command + gobject-introspection ]; buildInputs = [ @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { cinnamon-desktop dbus glib - gobject-introspection gtk3 libcanberra libdrm diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 0b4e3be1a32..f82c00f4a9d 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { libexif exempi gvfs - gobject-introspection libgsf ]; @@ -60,6 +59,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool shared-mime-info + gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 7139dce15c7..5b38d0662ea 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection (python3.withPackages (ps: with ps; [ pygobject3 setproctitle # mate applet diff --git a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix index 7f377d2a6e7..eecdbeb990b 100644 --- a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config go + gobject-introspection ]; buildInputs = [ libgudev - gobject-introspection ]; makeFlags = [ diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index d66efad0728..5c5aba52704 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -58,7 +58,6 @@ python3.pkgs.buildPythonApplication rec { glib libmediaart gnome-online-accounts - gobject-introspection gdk-pixbuf python3 grilo diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 7528f1bc3a5..5c49914cdf0 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { desktop-file-utils libxslt.bin asciidoc + gobject-introspection ]; buildInputs = [ @@ -153,7 +154,6 @@ stdenv.mkDerivation rec { ibus gnome-desktop gnome-settings-daemon - gobject-introspection mesa # recording diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index 0f864c6f349..2202e94881c 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook gi-docgen xorgserver + gobject-introspection ]; buildInputs = [ @@ -110,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { glib gnome-desktop gnome-settings-daemon - gobject-introspection gsettings-desktop-schemas gtk3 libcanberra diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 360095a8ad1..4c0960eb25e 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -108,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 gi-docgen xorgserver + gobject-introspection ]; buildInputs = [ @@ -116,7 +117,6 @@ stdenv.mkDerivation (finalAttrs: { glib gnome-desktop gnome-settings-daemon - gobject-introspection gsettings-desktop-schemas atk fribidi diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 835fa31dd29..1b09d4da0ef 100644 --- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -32,7 +32,6 @@ buildPythonApplication rec { buildInputs = [ gnome.gnome-shell - gobject-introspection # for Gio typelib ]; pythonPath = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 8f38558e93f..4f50def6cbd 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -20,28 +19,20 @@ , libgee , libhandy , libical +, libportal-gtk3 }: stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.1.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; rev = version; - sha256 = "sha256-psUVgl/7pmmf+8dP8ghBx5C1u4UT9ncXuVYvDJOYeOI="; + sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E="; }; - patches = [ - # build: support evolution-data-server 3.46 - # https://github.com/elementary/calendar/pull/758 - (fetchpatch { - url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch"; - sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -63,6 +54,7 @@ stdenv.mkDerivation rec { libgee libhandy libical + libportal-gtk3 ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index bba8fb4a723..d33242b77df 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -19,28 +18,20 @@ , libgee , libhandy , libical +, libportal-gtk3 }: stdenv.mkDerivation rec { pname = "elementary-tasks"; - version = "6.3.1"; + version = "6.3.2"; src = fetchFromGitHub { owner = "elementary"; repo = "tasks"; rev = version; - sha256 = "sha256-b8KUlfpZxRFDiBjgrV/4XicCcEw2fWaN78NaOq6jQBk="; + sha256 = "sha256-6Vwx+NRVGDqZzN5IVk4cQxGjSkYwrrNhUVoB8TRo28U="; }; - patches = [ - # Port to libsoup 3 - # https://github.com/elementary/tasks/pull/345 - (fetchpatch { - url = "https://github.com/elementary/tasks/commit/22e0d18693932e9eea3d2a22329f845575ce26e6.patch"; - sha256 = "sha256-nLJlKf4L7G12ZnCo4wezyMRyeAf+Tf0OGHyT8I1ZuDA="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -61,6 +52,7 @@ stdenv.mkDerivation rec { libgee libhandy libical + libportal-gtk3 ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 0b9c3213b3d..154a8b65a5c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY="; + sha256 = "sha256-X5EGDS8/EazIHiDBHCisd+XPE9dMx/0lQ8hrz9imUno="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 1b531d77c43..c8dd5428ed1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-GJjtGLCBRISaopZWli/MfqrPcG+xjY7nHZKS+S806GI="; + sha256 = "sha256-iq1QXC6eQ2w5j9RCxhTc0dApMfiDGcVuj8nocEFLFNk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index f7e24194223..c5b221e82eb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -7,6 +7,7 @@ , pkg-config , vala , libgee +, libhandy , granite , gtk3 , pulseaudio @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-a3GYtV0f+I9grnwndGI782/shpUWpR6GrRRD380Q6+o="; + sha256 = "sha256-JXt/S+vNzuRaRC0DMX13Lxv+OoAPRQmSLv9fsvnkWY4="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee + libhandy pulseaudio switchboard ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 94a6e533dda..c3f31624fff 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "sha256-6rjZOX9JOTjZwqWVWTtKjGNy8KgWllE9VQZzwhuBAwE="; + sha256 = "sha256-m/xuaMCAPoqhl/M547mdafBPBu3UhHmVmBIUKQoS5L8="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 163351075c6..a5a011fbaa1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-a11y"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-iS+xTCjbRZfaUiOtHbQ+/SaajfWWAlC9XiZbIGZPO9I="; + sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 298b89d7e97..4f44b337fd1 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-i7fSKnP4W12cfax5IXm/Zgy5vP5z7S43S80gvzWpFCE="; }; + patches = [ + # Fix broken notification filter + # https://github.com/elementary/notifications/pull/207 + (fetchpatch { + url = "https://github.com/elementary/notifications/commit/4691ec869316be94598d8e55e1cd3bd525e8e149.patch"; + sha256 = "sha256-4x/Us92Mgws5v+ZQiKvjQ4ixfBnU8oTQ92rc+nf8Zdg="; + }) + ]; + nativeBuildInputs = [ glib # for glib-compile-schemas meson diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 6f4cf8cf8d1..805956d3327 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -10,6 +10,7 @@ , accountsservice , dbus , desktop-file-utils +, fwupd , geoclue2 , glib , gobject-introspection @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o="; + sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice dbus + fwupd geoclue2 glib gtk3 diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 3820cae101a..9f1373d7d92 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -3,15 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-volumed-pulse"; - version = "0.2.3"; + version = "0.2.4"; - sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc="; - - # https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3 - postPatch = '' - substituteInPlace configure.ac.in \ - --replace "2.16" "2.26" - ''; + sha256 = "sha256-NDIJRjKV5aoM2sLhZ6WmoynOc4yz55KpuiTJDMLMA5Y="; buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index b1fdde8d866..ed74dfd4823 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: +{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null, testers }: let platform = with stdenv; @@ -8,30 +8,41 @@ let else if isSunOS then "solaris" else "linux"; # Should be a sane default in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chicken"; version = "5.3.0"; binaryVersion = 11; src = fetchurl { - url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; + url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz"; sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY="; }; + # Disable two broken tests: "static link" and "linking tests" + postPatch = '' + sed -i tests/runtests.sh -e "/static link/,+4 { s/^/# / }" + sed -i tests/runtests.sh -e "/linking tests/,+11 { s/^/# / }" + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + # -fno-strict-overflow is not a supported argument in clang + hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; makeFlags = [ - "PLATFORM=${platform}" "PREFIX=$(out)" - ] ++ (lib.optionals stdenv.isDarwin [ - "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "PLATFORM=${platform}" + "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" + "TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" + ]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "HOSTSYSTEM=${stdenv.hostPlatform.config}" ]); nativeBuildInputs = [ @@ -44,24 +55,16 @@ stdenv.mkDerivation rec { bootstrap-chicken ]; - postInstall = '' - for f in $out/bin/* - do - wrapProgram $f \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} - done - ''; - doCheck = !stdenv.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ - -p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))" + -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/chicken -version - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "csi -version"; + }; meta = { homepage = "https://call-cc.org/"; @@ -77,4 +80,4 @@ stdenv.mkDerivation rec { Windows, and many Unix flavours. ''; }; -} +}) diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index a85a98d46cb..2d246235592 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -17,14 +17,16 @@ in (stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ chicken makeWrapper ]; buildInputs = [ chicken ]; + strictDeps = true; + CSC_OPTIONS = lib.concatStringsSep " " cscOptions; buildPhase = '' runHook preBuild - chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -no-install -host ${lib.escapeShellArgs chickenInstallFlags} runHook postBuild ''; @@ -33,7 +35,7 @@ in export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -host ${lib.escapeShellArgs chickenInstallFlags} for f in $out/bin/* do diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index 171419a39e8..bc85f6e1009 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.22.0-m1"; + version = "1.22.0-m7"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-p7QNSsDI8hVMPPfkX3PNjJo01hsPGKZ7jMR9Kmj2qxY="; + sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU="; }; configurePhase = '' diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 2e15012452a..1f934ef5d46 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -24,6 +24,7 @@ args@ , libkrb5 , krb5 , makeWrapper +, markForCudatoolkitRootHook , ncurses5 , numactl , nss @@ -31,6 +32,7 @@ args@ , python3 # FIXME: CUDAToolkit 10 may still need python27 , pulseaudio , requireFile +, setupCudaHook , stdenv , backendStdenv # E.g. gcc11Stdenv, set in extension.nix , unixODBC @@ -80,11 +82,15 @@ backendStdenv.mkDerivation rec { addOpenGLRunpath autoPatchelfHook autoAddOpenGLRunpathHook + markForCudatoolkitRootHook ] ++ lib.optionals (lib.versionOlder version "11") [ libsForQt5.wrapQtAppsHook ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ]; + depsTargetTargetPropagated = [ + setupCudaHook + ]; buildInputs = lib.optionals (lib.versionOlder version "11") [ libsForQt5.qt5.qtwebengine freeglut @@ -129,10 +135,10 @@ backendStdenv.mkDerivation rec { (lib.getLib libtiff) qt6Packages.qtwayland rdma-core - ucx + (ucx.override { enableCuda = false; }) # Avoid infinite recursion xorg.libxshmfence xorg.libxkbfile - ] ++ (lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib ([ + ] ++ (lib.optionals (lib.versionAtLeast version "12") (map lib.getLib ([ # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for: # - `libcurl.so.4` curlMinimal @@ -177,7 +183,9 @@ backendStdenv.mkDerivation rec { "libcom_err.so.2" ]; - preFixup = '' + preFixup = if lib.versionOlder version "11" then '' + patchelf $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so + '' else '' patchelf $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so ''; @@ -280,24 +288,12 @@ backendStdenv.mkDerivation rec { sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" '' + # Point NVCC at a compatible compiler - # FIXME: redist cuda_nvcc copy-pastes this code - # Refer to comments in the overrides for cuda_nvcc for explanation # CUDA_TOOLKIT_ROOT_DIR is legacy, # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the compiled - # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as - # the default set of CUDA capabilities we build can regularly cause this to occur (for - # example, with Magma). '' mkdir -p $out/nix-support cat <<EOF >> $out/nix-support/setup-hook cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' - cmakeFlags+=' -DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${backendStdenv.cc}/bin' - if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${backendStdenv.cc}/bin; - fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin -Xfatbin=-compress-all' EOF # Move some libraries to the lib output so that programs that diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix index f14a55aa6cf..93800a0dbc6 100644 --- a/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/extension.nix @@ -38,10 +38,39 @@ final: prev: let cudaFlags = final.callPackage ./flags.nix {}; + # Internal hook, used by cudatoolkit and cuda redist packages + # to accommodate automatic CUDAToolkit_ROOT construction + markForCudatoolkitRootHook = (final.callPackage + ({ makeSetupHook }: + makeSetupHook + { name = "mark-for-cudatoolkit-root-hook"; } + ./hooks/mark-for-cudatoolkit-root-hook.sh) + { }); + + # Normally propagated by cuda_nvcc or cudatoolkit through their depsHostHostPropagated + setupCudaHook = (final.callPackage + ({ makeSetupHook, backendStdenv }: + makeSetupHook + { + name = "setup-cuda-hook"; + + substitutions.ccRoot = "${backendStdenv.cc}"; + + # Required in addition to ccRoot as otherwise bin/gcc is looked up + # when building CMakeCUDACompilerId.cu + substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; + } + ./hooks/setup-cuda-hook.sh) + { }); + in { inherit backendStdenv cudatoolkit - cudaFlags; + cudaFlags + markForCudatoolkitRootHook + setupCudaHook; + + saxpy = final.callPackage ./saxpy { }; } diff --git a/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh new file mode 100644 index 00000000000..5c18760a3a2 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh @@ -0,0 +1,8 @@ +# shellcheck shell=bash + +markForCUDAToolkit_ROOT() { + mkdir -p "${prefix}/nix-support" + touch "${prefix}/nix-support/include-in-cudatoolkit-root" +} + +fixupOutputHooks+=(markForCUDAToolkit_ROOT) diff --git a/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh new file mode 100644 index 00000000000..89801eb7c21 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh @@ -0,0 +1,5 @@ +# shellcheck shell=bash + +# CMake's enable_language(CUDA) runs a compiler test and it doesn't account for +# CUDAToolkit_ROOT. We have to help it locate libcudart +export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" diff --git a/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh new file mode 100644 index 00000000000..89256e86f78 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh @@ -0,0 +1,68 @@ +# shellcheck shell=bash + +echo Sourcing setup-cuda-hook >&2 + +extendCUDAToolkit_ROOT() { + if [[ -f "$1/nix-support/include-in-cudatoolkit-root" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$1" + + if [[ -d "$1/include" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$1/include" + fi + fi +} + +addEnvHooks "$targetOffset" extendCUDAToolkit_ROOT + +setupCUDAToolkitCompilers() { + echo Executing setupCUDAToolkitCompilers >&2 + + if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then + return + fi + + # Point NVCC at a compatible compiler + + # For CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" + export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" + + # For non-CMake projects: + # We prepend --compiler-bindir to nvcc flags. + # Downstream packages can override these, because NVCC + # uses the last --compiler-bindir it gets on the command line. + # FIXME: this results in "incompatible redefinition" warnings. + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + if [ -z "${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX="@ccFullPath@"; + fi + + export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" + + # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled + # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as + # the default set of CUDA capabilities we build can regularly cause this to occur (for + # example, with Magma). + # + # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix + if [[ -z "${dontCompressFatbin-}" ]]; then + export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" + fi + + # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for + # CUDAToolkit_ROOT. We have to help it locate libcudart + if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then + export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" + fi +} + +setupCMakeCUDAToolkit_ROOT() { + export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" +} + +postHooks+=(setupCUDAToolkitCompilers) +preConfigureHooks+=(setupCMakeCUDAToolkit_ROOT) diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 3a6a16b1d76..ec2c9cf72a9 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -4,6 +4,7 @@ , fetchurl , autoPatchelfHook , autoAddOpenGLRunpathHook +, markForCudatoolkitRootHook }: pname: @@ -28,6 +29,7 @@ backendStdenv.mkDerivation { # directory to the rpath of all ELF binaries. # Check e.g. with `patchelf --print-rpath path/to/my/binary autoAddOpenGLRunpathHook + markForCudatoolkitRootHook ]; buildInputs = [ diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 7b8e02de247..b962b6caa1b 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -27,35 +27,27 @@ in inherit (prev.backendStdenv) cc; in { - # Point NVCC at a compatible compiler - # FIXME: non-redist cudatoolkit copy-pastes this code + # Required by cmake's enable_language(CUDA) to build a test program + # When implementing cross-compilation support: this is + # final.pkgs.targetPackages.cudaPackages.cuda_cudart + env.cudartRoot = "${prev.lib.getDev final.cuda_cudart}"; - # For CMake-based projects: - # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html - # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + # Point NVCC at a compatible compiler - # For non-CMake projects: - # We prepend --compiler-bindir to nvcc flags. - # Downstream packages can override these, because NVCC - # uses the last --compiler-bindir it gets on the command line. - # FIXME: this results in "incompatible redefinition" warnings. - # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin - # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the - # compiled binaries. If binaries grow over 2GB, they will fail to link. This is a problem - # for us, as the default set of CUDA capabilities we build can regularly cause this to - # occur (for example, with Magma). - postInstall = (oldAttrs.postInstall or "") + '' - mkdir -p $out/nix-support - cat <<EOF >> $out/nix-support/setup-hook - cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin' - if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${cc}/bin; - fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin -Xfatbin=-compress-all' - EOF - ''; + # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to + # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the + # setupCudaHook, i.e. we want it the hook to be propagated into the + # same nativeBuildInputs. + # + # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, + # so that the final offsets for the propagated hook would be `(-1, 0) + + # (0, 0) = (-1, 0)`. + # + # In practice, TargetTarget appears to work: + # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 + depsTargetTargetPropagated = [ + final.setupCudaHook + ]; }); cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt b/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt new file mode 100644 index 00000000000..a6954e6e8be --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.25) +project(saxpy LANGUAGES CXX CUDA) + +find_package(CUDAToolkit REQUIRED COMPONENTS cudart cublas) + +add_executable(saxpy saxpy.cu) +target_link_libraries(saxpy PUBLIC CUDA::cublas CUDA::cudart m) +target_compile_features(saxpy PRIVATE cxx_std_14) +target_compile_options(saxpy PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: + --expt-relaxed-constexpr>) + +install(TARGETS saxpy) diff --git a/pkgs/development/compilers/cudatoolkit/saxpy/default.nix b/pkgs/development/compilers/cudatoolkit/saxpy/default.nix new file mode 100644 index 00000000000..f347b43d1d1 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/saxpy/default.nix @@ -0,0 +1,50 @@ +{ autoAddOpenGLRunpathHook +, backendStdenv +, cmake +, cuda_cccl +, cuda_cudart +, cudaFlags +, cuda_nvcc +, lib +, libcublas +, setupCudaHook +, stdenv +}: + +backendStdenv.mkDerivation { + pname = "saxpy"; + version = "unstable-2023-07-11"; + + src = ./.; + + buildInputs = [ + libcublas + cuda_cudart + cuda_cccl + ]; + nativeBuildInputs = [ + cmake + + # NOTE: this needs to be pkgs.buildPackages.cudaPackages_XX_Y.cuda_nvcc for + # cross-compilation to work. This should work automatically once we move to + # spliced scopes. Delete this comment once that happens + cuda_nvcc + + # Alternatively, we could remove the propagated hook from cuda_nvcc and add + # directly: + # setupCudaHook + autoAddOpenGLRunpathHook + ]; + + cmakeFlags = [ + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DCMAKE_CUDA_ARCHITECTURES=${with cudaFlags; builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" + ]; + + meta = { + description = "A simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; + license = lib.licenses.mit; + maintainers = lib.teams.cuda.members; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu b/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu new file mode 100644 index 00000000000..912a6d1647b --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu @@ -0,0 +1,68 @@ +#include <cublas_v2.h> +#include <cuda_runtime.h> +#include <vector> + +#include <stdio.h> + +static inline void check(cudaError_t err, const char *context) { + if (err != cudaSuccess) { + fprintf(stderr, "CUDA error at %s: %s\n", context, cudaGetErrorString(err)); + std::exit(EXIT_FAILURE); + } +} + +#define CHECK(x) check(x, #x) + +__global__ void saxpy(int n, float a, float *x, float *y) { + int i = blockIdx.x * blockDim.x + threadIdx.x; + if (i < n) + y[i] = a * x[i] + y[i]; +} + +int main(void) { + setbuf(stderr, NULL); + fprintf(stderr, "Start\n"); + + int rtVersion, driverVersion; + CHECK(cudaRuntimeGetVersion(&rtVersion)); + CHECK(cudaDriverGetVersion(&driverVersion)); + + fprintf(stderr, "Runtime version: %d\n", rtVersion); + fprintf(stderr, "Driver version: %d\n", driverVersion); + + constexpr int N = 1 << 10; + + std::vector<float> xHost(N), yHost(N); + for (int i = 0; i < N; i++) { + xHost[i] = 1.0f; + yHost[i] = 2.0f; + } + + fprintf(stderr, "Host memory initialized, copying to the device\n"); + fflush(stderr); + + float *xDevice, *yDevice; + CHECK(cudaMalloc(&xDevice, N * sizeof(float))); + CHECK(cudaMalloc(&yDevice, N * sizeof(float))); + + CHECK(cudaMemcpy(xDevice, xHost.data(), N * sizeof(float), + cudaMemcpyHostToDevice)); + CHECK(cudaMemcpy(yDevice, yHost.data(), N * sizeof(float), + cudaMemcpyHostToDevice)); + fprintf(stderr, "Scheduled a cudaMemcpy, calling the kernel\n"); + + saxpy<<<(N + 255) / 256, 256>>>(N, 2.0f, xDevice, yDevice); + fprintf(stderr, "Scheduled a kernel call\n"); + CHECK(cudaGetLastError()); + + CHECK(cudaMemcpy(yHost.data(), yDevice, N * sizeof(float), + cudaMemcpyDeviceToHost)); + + float maxError = 0.0f; + for (int i = 0; i < N; i++) + maxError = max(maxError, abs(yHost[i] - 4.0f)); + fprintf(stderr, "Max error: %f\n", maxError); + + CHECK(cudaFree(xDevice)); + CHECK(cudaFree(yDevice)); +} diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 9ffe00437e7..9fa296842ef 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused # shellcheck shell=bash -set -euo pipefail +set -Eeuo pipefail release () { local content="$1" @@ -64,6 +64,11 @@ generate_package_list() { local url hash url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" hash="$(nix-prefetch-url "$url")" + if [[ -z "$hash" ]]; then + echo "Failed to fetch hash for $url" >&2 + exit 1 + fi + echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" done } @@ -327,6 +332,10 @@ Examples: channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") + + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v$channel_version ($support_phase) @@ -349,7 +358,9 @@ $(aspnetcore_packages "${aspnetcore_version}") $(sdk_packages "${runtime_version}") ]; }; -}" > "./versions/${sem_version}.nix" +}" > "${result}" + + cp "${result}" "./versions/${sem_version}.nix" echo "Generated ./versions/${sem_version}.nix" done } diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 57b420f93ba..30cffb04d64 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.19"; + version = "6.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fb0913f6-79a8-40b6-b604-bda42b60d0c2/eb98e78d3d75c16326a54cd0277b5406/aspnetcore-runtime-6.0.19-linux-x64.tar.gz"; - sha512 = "537e4b1be4fcaa5e69013b99c86808e0a13994c87d7542367b3eb18196206d1c27e46a865d89784229a04f69dadbe0b283d7adf1e7848c8d3c7998ee80c9e765"; + url = "https://download.visualstudio.microsoft.com/download/pr/972dc929-4c16-4456-a7c8-64014f80678d/a3b62252f98a0d7e0c0a9a01ede18776/aspnetcore-runtime-6.0.20-linux-x64.tar.gz"; + sha512 = "891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/86b5e7ea-d316-4b44-a543-95cbfeafadd9/7e7b8ed4c007d9290c2099b5bcd144af/aspnetcore-runtime-6.0.19-linux-arm64.tar.gz"; - sha512 = "739acf3966e32092243f9a2ede241a16b2ae7c26bccdbcd53e63149429c4fad7d7166beca8c54ef1e79f18b43d3a5334bab42128a534aae7499cd137b833e888"; + url = "https://download.visualstudio.microsoft.com/download/pr/a8a1a993-ddd9-4bcd-8386-d9defcf0fd29/4b471f72c8253fa1462ea923d0fe39a2/aspnetcore-runtime-6.0.20-linux-arm64.tar.gz"; + sha512 = "83b1825c80cabfa5bbbd8c3e69b3525fa5cebef773957f96fee9319d60285155817973a176d47348c9b22bff5af24044f0f06b59229c067ce8adad4f3d4123de"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ff5fcf0c-64a2-4b7c-a406-06ac6e0369ec/7edc4ca9309235eb554cfd580aa6ca37/aspnetcore-runtime-6.0.19-osx-x64.tar.gz"; - sha512 = "405f3ef158ae0d8bbf755628b6d3131618255170885164422107955d94ee8483adbd6cedf4e5b414413cefcb15945efa2b44675b1f851647ffb4d92eea7505b0"; + url = "https://download.visualstudio.microsoft.com/download/pr/5fe2084e-1538-4193-9eb6-54b0f8470574/258915bac675b1dea6aa0b5435f64981/aspnetcore-runtime-6.0.20-osx-x64.tar.gz"; + sha512 = "5f6efea102c20805430815228070461216d8c5b928d090ec9d6d245eecbe23298920d1834276a0ce77bba524a14c83d97464580c72660bf3a2367a02f1872e31"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/af7c7c1e-4bcc-494e-b454-fcca9577426f/53d486a54766bc79208f72bb60beda29/aspnetcore-runtime-6.0.19-osx-arm64.tar.gz"; - sha512 = "6cff56c4da0d55eafb334775792b92ff22d1b3b6aea85375f90e55e4f850330f70eccab3d8bc8755c8a5895df4d7db9c3099f63982a1ec58ada196d2fcb574f5"; + url = "https://download.visualstudio.microsoft.com/download/pr/14d8afd0-2635-4f3c-96fa-63edccafe16f/317d19d4f625bdae211d428ab880a331/aspnetcore-runtime-6.0.20-osx-arm64.tar.gz"; + sha512 = "fbc4033b79a651923dc205b923ef6c9ef048c862113ebcaeb8fa6388827245039369e261e89ac371e895c538aa78fdfc07a5a1c1cbc41713f54a15bdc0ffdf5d"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.19"; + version = "6.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/59b2fb63-9075-4ee8-9120-d6d048226aa0/fe92c70fec406174fa2585c9b668900b/dotnet-runtime-6.0.19-linux-x64.tar.gz"; - sha512 = "6e8e1db8b247c92c8de4b476e06ad464b0bd664919394afd5fb3962db477490e54865abd2510c29457efdef3be23f0ea4683d6caabcc74a6d7abddce4b4a154d"; + url = "https://download.visualstudio.microsoft.com/download/pr/26b4797f-d3f2-40c7-8f4a-91120ab87469/4677c3c4e3ee7919836c3a5336e04509/dotnet-runtime-6.0.20-linux-x64.tar.gz"; + sha512 = "3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5428b024-2cca-483c-b103-429b04611e0c/8db2a6abdd0abbb00714d700e8acccd8/dotnet-runtime-6.0.19-linux-arm64.tar.gz"; - sha512 = "7698ae2a9f7bc32f99cb2a945cc58b47e173720412604807c09c682cc03edec8e4a7cf19d73e087733437da77e7f05ecc8618296f7f9165ac8ff5dfe51dda346"; + url = "https://download.visualstudio.microsoft.com/download/pr/f45ea605-cd0d-446b-9d79-b9c033c10c11/ba7fd32581bb5f448abdd317d8d55b3f/dotnet-runtime-6.0.20-linux-arm64.tar.gz"; + sha512 = "bf9cd8b13ebe15bbe41d4f3229cc902c3de2eb4f0008f4b239f3d0ec5aa01254adb8a98742c0e32e98f4ba95923611ed9f54963225b462a829c184301bc98ef1"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a9559a9f-3e72-4fde-bc55-b5fd2260ad5f/f501dba0830e7cfdbf73c7d9780abaac/dotnet-runtime-6.0.19-osx-x64.tar.gz"; - sha512 = "c0b7738b198789ba0fe4e2b301aed2b129eb8b09e826c35b6e56b9a205d4d7650841cc0870bb3629c3aef58e03b59cbc37da6495bea4ad674b62d81240639b4d"; + url = "https://download.visualstudio.microsoft.com/download/pr/810c2cf6-c3a3-4f35-91f4-facf1ac24ef1/3ecedc1a0888b571d272c0dd64080c52/dotnet-runtime-6.0.20-osx-x64.tar.gz"; + sha512 = "f21cb044df7d1f57ad45b7ed65893a103cd6fe15b78ed3865380044207136d42deddde29872458e70fae9c8e7f254dd032f7539b4b9820995a075d92b907d49f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9e22fdfd-02df-4b83-ae80-933ab45da241/678caea6e30c0c4673f398cd42288f2f/dotnet-runtime-6.0.19-osx-arm64.tar.gz"; - sha512 = "9a7d0d2c493dcb0cccfd2ff9dcb234a6886f7c261a1a403aa896ccb3e6d76be6d7ad865e18e8f040f769833cc41f1caad7cce2909f9c4ded5ba3bba219c76071"; + url = "https://download.visualstudio.microsoft.com/download/pr/0f3ecdea-c85c-423b-ab55-d97061a3d9f0/b01dd205c4d6ffdb6266e4540c82621d/dotnet-runtime-6.0.20-osx-arm64.tar.gz"; + sha512 = "27297a16bf1eec0e5a4154d8575b66008227a595cdd77277ae9796a53522b143ff51e063a7aa53a6c57717061cb2e5836c314ee43eeb86d465341fcdf834d773"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.411"; + version = "6.0.412"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1f26cd3a-af60-4140-9cab-b661cfe0a1ed/4d533d26ef5d55fa17f23c207f6d3330/dotnet-sdk-6.0.411-linux-x64.tar.gz"; - sha512 = "dc8aa1f84ad97cf25a979bfc243c200b7a8e73b930b68d5eed782743d88aad823c32c267c83d7a19d3c4f910a8fae7f12d07ea5a35a1d3a97e13a8674d29037b"; + url = "https://download.visualstudio.microsoft.com/download/pr/62181759-93ce-4512-8de1-92de74a6ba3f/f83ea41c3161f301d3584598f9c31801/dotnet-sdk-6.0.412-linux-x64.tar.gz"; + sha512 = "ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/43eb599e-df6d-4303-b266-b96a9f77a8ca/a5c595017960d21f6d7b89530bff173f/dotnet-sdk-6.0.411-linux-arm64.tar.gz"; - sha512 = "e10aed4470087f30e48bf2c3d7e98a680cb7b5f5cfaaf2f7e5029c648e4df9ab140bfcef3b84195f6f8984b56b4156b7afde957b3695e68e9ed24934414a62d9"; + url = "https://download.visualstudio.microsoft.com/download/pr/daff8399-d60f-4bde-97bb-c6e350c03e90/5eeb0b21bf1ad11b5f5a7b4ac217c381/dotnet-sdk-6.0.412-linux-arm64.tar.gz"; + sha512 = "669c19665f657de00fda41e5ffff8d80395618dc1cc7d6ec50cd06668b135b5fcca193919172c65394210b7c060eae146fd6d8d57deed889ca8fafddca66d06d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d53a8cc3-7c70-4374-8072-5ddd6a75ff5b/0b64e3ca7c14755bd4d806ca235a2760/dotnet-sdk-6.0.411-osx-x64.tar.gz"; - sha512 = "11068da9ae996d0f0c2410ab2fc0a6637d5daa25ef9c152cbd509ee9ef51e452134a787b5214e8122a797b3cd00771fa3bd54c2e4aacbb3cf8ef103dc85b0a99"; + url = "https://download.visualstudio.microsoft.com/download/pr/094020b2-7fcd-45aa-a122-42ad85b25d15/969de8f0d024a5bee5260271e097519b/dotnet-sdk-6.0.412-osx-x64.tar.gz"; + sha512 = "0aa713780c4b7f4e0ea72a0813715883f57174f04386b85f3a6dda1a66d9cf6d24c76cd1e0fc0a0991b80b7868b39c719d5b98254e4f683b6bc89a9b4043be9c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5288044c-41cd-43f1-af79-9aa29f6e5a10/aaf4fa836481a4ff3a0f9bf79c4ffffc/dotnet-sdk-6.0.411-osx-arm64.tar.gz"; - sha512 = "0095606938cf1b6d5c54516ccc4d9ff276c567e569d2644dfc2f00c8a20c88ca8b09cfa1bb1254c04463887cb9c2bc057e62afde026948ca326998048c4d5d0d"; + url = "https://download.visualstudio.microsoft.com/download/pr/6a6555e3-06ff-4124-aad5-497a2940398b/47bda2f1324f867ae0da2099c5702769/dotnet-sdk-6.0.412-osx-arm64.tar.gz"; + sha512 = "3086e027b94ab8bc5b27e2dfaa7d16484efa2f6a7c1e291f420313021b3e6f65a5208de4b0d86271c3b83d05d784f29e231176dc6f5ba04e567336b7d7b7b871"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.19"; sha256 = "00y8riq5mvgyazbp7x9wijn3kxv7r88hwlyfv9f6a7vkp7w1d011"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.19"; sha256 = "0djzym7lil7p0v4h3x077vjbbh7k8dvij6swn7dk83xmyf87bfca"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.19"; sha256 = "0gy5r2p9l0wwc7lz4pn4ja2wcaw1cwy4w1j4qf0iv6057xmqbikq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.19"; sha256 = "1rmngjkdq9f7zflxy3fgznchjh67g3zd5wv9a7vdl7b6z07psjnk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "1izm1kx4rwi6cp6r6qzjn9h1lmqdcx87yj4gnf291gnabgwpdg9i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.19"; sha256 = "0z4f9jwb6g7xix9xiwldadxr00scbl7qcyvs5j7xsidmwk9dcaiv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.19"; sha256 = "0av7ia56k22scyy0s45v6sv584n6mcpbyibn76pka2ah6jhq7dnl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.19"; sha256 = "1lnqljdakd8hrrq2hxay2ycagpbdlpbj3ck2j41vyddlnn53vf6b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.19"; sha256 = "1c8g5gy0x8bp75ff0nssvcsq2axwvi26jkzxip30y3r12jh6jw52"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.19"; sha256 = "0vm7d5dp8rgy5ic4qdvj59hifyy8g1b45j1w40w0sbrqbmak89na"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.19"; sha256 = "1r41m93kacyyhgjxmhx84n9wv9c2ckwa8295qa4kj8rn73gg4x28"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.19"; sha256 = "12zmayccdmhwci83xgvmylp13xl96ddw85r6cyccqxfk21x1dhd8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.19"; sha256 = "1wsjgz3kgxifzc8f6jrgyb89rbngffj9skadqacy4bw158aklps9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.19"; sha256 = "0bv39s9854b7kp9w5068qq5dgyzdfbr5hq0i80cbpj6srxndf9im"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.19"; sha256 = "0ixizxdp0hg98frrka85x37ly0ji006ix9a52dxas3463hdmcazb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.19"; sha256 = "0bdprwa1vklf32w2hpnb0h316pqihy9gfx9z1xgiwljfkdjhin6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.19"; sha256 = "1a062b09klc0xxkgb7qlxxpl52cmh7vmicy1227ch8qdkwf82nia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.19"; sha256 = "0xf920dcy92gyf1a4ply370m1k82ja9srql5sq7wm2prl1y77wxp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.19"; sha256 = "0ib7fyl91av9vv734k73l9i37b3iph1gidvg37s556f09s61xg4g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.19"; sha256 = "0lbnhfh3xh92gzpgpvmbyk1af3rcva7annayd65v4m27pcixdszv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.19"; sha256 = "04vnz3izwk42igr6p569yas08g6j0ims0ryfsi3qbma095117lq6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.19"; sha256 = "1xl4xrijlkia4vxqyg77sf2gb0r5bgwrzc6yidivwxijmaxmvx3z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.19"; sha256 = "1148n1shzmyxyqq1fqr7f55z6r0z55vjzyj4px80vjf46rs97h8h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.19"; sha256 = "1635s0h8z55blb8bd1y8ppwac6w19f0w6hmx2nqz433968w74fk4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.19"; sha256 = "0448b8lfv770qijzxxn3mv4xlw7cp00z52i7qqmmzf2b3vgwcr1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.19"; sha256 = "1cx8vkwdgh9ai85ps46yb43x5mvxzk579mkyblxsn4b0nm5gqmsc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.19"; sha256 = "0xjiny4vmk621f8h35vl6wlikzjq9xrhw0j6sgrs0k0ylphwmp2a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "0slhgkjlwcmz4xjl0x6rwhhcdc6f7hz0vb4lg5ak85inl5m98xa9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.19"; sha256 = "01hhi86mh3wjr6i31p5kbcqn6ks7kyhc06gfg1xaqyjrf0hkiiwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.19"; sha256 = "04pjx9r8ahv3c73l6rl5vm9sj7qml1yiav9w5v5kiyvk6sz8agk0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.19"; sha256 = "1rf27fgqz4xyqi8kxn3hcxwzngdpdpcyjhxc512z21f914pvfz4q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.19"; sha256 = "1j9hp3a74spw9srhyxx36lkgvyqvyckmssl7q72vwamwih4jkdbp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.19"; sha256 = "10irl9p2vszfrxn9s0x1kdcgdjzqvk365452632g9adpz0m96wkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1bq00ff77dj8a87paxxhg9qg3x44hs93vmddms2z2rbcv49wh2ra"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1dk2sqd4j2lr4xaidl99q1gygly52dz5hjpfqhvzkwq5rhm1q2sx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1iarfzmjb6rdwkp4s0j8zqk0jjmllii1hhrfkmgjhrf9j7zz4qli"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0d3l3bbfzqzxrwgif6z7a4h0788nm68m5viz9r3jk4cpkc1p8l5r"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1qxcsdixcf66pg8hyjwb5k2yl1srnm4l6ylhs4nbv9s86kfbafp4"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0s34svz8dm533nl6g8cbpia6ap0rbimifwraswc20lgj1vi0f30p"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0mxwikpy61b4kqa8a01gfzzy5nymyk9z6r4br51y43dzqrmi461k"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0k5mv3m91r19gv3f8hgn558694szpag9d2a5w29xvdy8h3mm6vp2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0ipq0a9ij6jn469wd37pnc7np38hxip7452lkm07f6nkihvkg0m3"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1ps5imiyxcy7rf6cgpkn9p6mz74w606nxb2sbs675yrn3c473kls"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1729vshl38927sy4bcbx48l3037x9hwjnxjnpp22v31fzjj1gr2x"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1wv9lqa3lgzqlhqkgcbr0w70g7g3la9j5i84wa6rqsc21y276gqq"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0lknp6kpb09k6flnv887nv4y7q4nhbblk5bdv4wz6gpswd1b8mck"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0yl201gy9bilz6zn0xa3lybv3lcpnycmrp8r5kjc6yh73qc32p26"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1fzawxv0nql0i62najx9gsq396w60cnairxysfm9312m4x5bfcxp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0jjnzhqxv00lnmjp49w998rrjhjm1ca7vlir0yv7jpbvhpx2c3g0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0gvin96ly03zik2wxabi9m1q3xg20myankp18awmwydmvma5my8f"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1dgd764pic3s6y4kzy2amxi42rb8bgbkknmg7gc5yz4wi8k2rm7g"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "11lbnzqdzalmqmbqkd4xn2nhx5n8kfjpv2akj76476dhanxfb0l8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "082jyxig3v9ah4f5rz6d4flwqm20dn999zsy6kp8ri6bkvmap2ww"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0ky58h37lprp3idwayvrcyn613pdzli24fx472iql5qvhgcgxg5y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0g2dhi7sh7gbwrwcinlkzpal6mys12rw6114scyh8xghfswggshi"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1nrijf8czcbjpkd3ay2czwxa26cl07mv7sbbz9q32ywfqdw16xpj"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0flz92scm9a3m08fgq99axh02qjhy14dzivzzf702xm9ipa37gds"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0cwqwlhbvc310hkqkfq1kx0vv77lkj1s4mda2ks4w05s3il42k1l"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1qwzh3rq4xg44kgyhqxnhddr9d1nmcm11nhj73m091xk0mnz26p9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0l66w1h3w6vqd9a8jag4dah6x929sc6684h8321mwy9d5wldx03w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "15483p2z4lyp2wir0lwlsjk5009nvp0j348ffnhqq115xadb1zz9"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1q08v78m9z02zmrrq19bjpbsfjzw4am82shj6mnkvhqy6r4aafh6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1fh221gf6bl7qcmklhhv58i81h6q33ivh6g46hx70hl96gz62dp9"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0y6pwh3psknbf2wz03fh1kamyc2xjgazncg76z7msj1sbm3898ac"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "117qw21q6xbvnji6nz79yfqi2i1wdk7kln02102vkl5gficz75y4"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1qypjwc7918v8qgzz3w2ypl6bsr3anqgb92bajbx4ha0cfrjmmfa"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1ybqpy5p7424allxgiqjccqx2wyidgylxy368d0n70w3jysyyxg7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "11xmb1gilncaj1d3i5ry7kbsszjyrqjlaws6n7nnr7rgw26jixrk"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "10nphwf6iibkx37z0prwww6bxi0ks22rm48k4sjksif7rp54mzrl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "16vpwyp3z1k9f58i9w8k6dfgdw9y4vqb9jb1qvgr6fdvaz40vnxa"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0whr0rkd9izqhm0bggj27xirwsi8sajiz8imvz34s65ka7q3vsz0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0a0sx27pjq282f9iky4djvlfhi3isnfy3fa033xv4in4lsml47gr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0p0s6i2s5xqdzcpb0xb1xb0lg8jnn2v91yyawgckj5c0bhvxl5jv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "130r44f2if0mgjjknbrbqs02gjvaqnixc1hgpj52gm1fpwmydh46"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1m1z7sl9ivz7ks5clsa7mgwx7ak41a3gg1rap4c4q24w5avk08m3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "10pq2smssbny6nbgrhb97mnhxqz0xh7rhscx18isqcammkpk4hsg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "17xk04myv6j3ij28frg2vkr3y35s501gx1c8dngzd30k3n029icw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.19"; sha256 = "1mm2czg8mczkdayx0z58qs91xbrqh9frmlmfd64b7424rayayrfd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.19"; sha256 = "03y87q5mx0bz0lc63barh0r4gymfv11190jgfdxph2cvd4ir7bdn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.19"; sha256 = "11wpx1386cjg78c5jqqh2jgwkp597yrnvy92icyh6ibiy0107wfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.19"; sha256 = "1lpx76v6113jppqn56pwqan9lgkqw7xd0x95fpyilczc52l3s46i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.19"; sha256 = "1ww8w5r3yvps19sc0nj2giqpsn64y807zw0ayshzn9shpba4gbbn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.19"; sha256 = "0r0q5jd7a0dbc2w767clz460pn6lhvrmimsrn3jqw9irgm7g2xns"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.19"; sha256 = "1k4m171nsb9m407izsnkayzalhdq6g5kwy5s8f7d2hd53azisb0z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.19"; sha256 = "1q977pxaxnm79lm9ma2hbbll7jnrpkp89pbb41jr4aywp34x151b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.19"; sha256 = "0j6h8w3vrgr4fps3bhycqpzlajyqlrm467p0gpq98ali07ckfrb0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.19"; sha256 = "0r3zdg1rapknp94m2hx42mx8wvyarq24cqdcvzd37wf6nmxmaigb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.19"; sha256 = "1adwrmr618bnc72gab4kg1sqnvvyp3zlzlaafh4n38xyi2hjihs7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.19"; sha256 = "0rmn0i1sy0q91dijw5k20gcbvqg840rqiihv89qqvpdw99al3xgh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.19"; sha256 = "1ck1ws817svrpf5xa100fw74s3mpscds67kjslw57ddi4gh0p07w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.19"; sha256 = "0xvmpr2vg7cknkzb172zqx8sj3a5fy7j0xxdxxc441hc8xyywh5i"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1l5zs4c975r6s1qp99yjvygil9w2r324r5v7i15x37bzc3xkr61f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1zv2vhi7krnibrm0khr0vk99wlxn9dgvhg0lvx9h0didfn94c71v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0x2d8hm8lffy3gc0lxd7njcdggclnvd48i1ybwq78ll07930mlky"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1ra6gvs7xk2iz9in8641ls30pbxlcmk493q3vcbg30acvm335nzh"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0q8md416zfk3swpv9j4fn00rxpfj6hgkxxsl57qr9pavsximknhp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "11vyd6rr47dwfyraz86clza3i6nl8kakj6dys1g436d56mc9qxl0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1kg0g83sh4kvxda508mav7xkfd56c3nsxj181hsgdz995yrnpmwz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1x86splyckv4zxxj39maq7ppjpvfs8zdq98cbrpk0apb2m20clia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.19"; sha256 = "0q5dp89vh189wa0yzhn9msgxs0d6ch822kz3dx8wpg523xwcf700"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.19"; sha256 = "0jy52i7smi8gsddmbd2isc9l1c4vyir6bb6q4pdwk8nrspl9v153"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.19"; sha256 = "1piir71cvir9xjdmmsais4q00gy64lllbcmzrlmjbip2hvxqbi2b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.19"; sha256 = "01v4w53jaq8fbrlf1dd08b0xmlf34qgchlavf8l7l4qzfzk1zc1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.19"; sha256 = "1apazbfb96gc3lhj9yq4n1yczsbgjnfrc2a36yqkacfkrzcz5sdb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.19"; sha256 = "03mgjj0sq8h5k7rhi3g4xvc6w129l99fzipqcpri87gq2v2rq9bc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.19"; sha256 = "023bmkhi489932srjpjgni96nifvj04556b1cb69ysqcw2blyjlh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.19"; sha256 = "0gr4y4wmkv8hvrv7j93cdxyaifgm5shslswy237xb3bi2rn91f2j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "1jncn2n75vrhsmh22f5ij5rhdr2ninnz0z8clsi3pmk8ba2jzgsh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "1ssakq877f2wn51di8v64b3ij0izyr5glc37i238y9jm6l84kpyg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0a6d269chp0126sx2igjhsrn7x6q03n5qwhwk7fy6ci1jddrk960"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "13b3yr8y54g5ypnsrr7870csbnl9avwa7r6gk7553sjab255rar4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1js58646f4233g6a9lkwwwhg0kb2x3r60a66lbzapk253x00fnrm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "1cwn0dkwk2wvddfraqh28yqy3p5cyrnfkprilgy3bqbnq82mfdxj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1paf9f3kmprw09nh1garni8rswcq7cs5m1ib6hkrkqccdis4hfy8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zr589pkivak83gjd7f15rc9g4whxmywjj1xyymbbaz46ain89gy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "0azf6q99aplbca8p2ijf9ccwrigz9r2aaplczj8byi0jd5dgya1m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "134a4yszz8gvba2zm8lrds39qfxrf42mziy4niihd4r9n44ksrdn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.20"; sha256 = "0ijdgv1yczfppra6p770vf48vjgmrmcjxfnphah8rrlidssja1dj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0k4ivzwbj67n4rr56fmi4jh2y3kdjhbgc376gk0ld50qwpghczxh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1yiq9ihh71d8zlfsdf9xdnapzilxiyk987z9ld7w605sq6b45719"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.20"; sha256 = "039hs39abf1ngrgw1ali8pgzqqpwl6aiq7hqig85gj6phy5l8wbk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.20"; sha256 = "0xivyv70kzpj4pc4ln1rk48bm9z9zy3bck1m4vg161rrd58ry16a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.20"; sha256 = "06a211fjm9i9ipgh7y6fsp2si41mdr8hp5wpsvd083ybyyfsy32z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.20"; sha256 = "00vz5r4l5p78fkvlglvhhvx80qlv5szzdz9scf0qm8hf1v01wivi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.20"; sha256 = "1g0x96f8i8hiflzpb20h9wkn784zzlvd0413y8xlxgf187hj20yn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.20"; sha256 = "11sdzb1lrpmmfbd14b3may8d1n8smm1rmfsqamp7bni408j16cfc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.20"; sha256 = "0w69cfyww088v29bs6diy9jq0sl6bpiaildvq6rayl9vwid71qpi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.20"; sha256 = "1bi8bmil8wc42lp5b7a44c70mazycgxn2ag02r3r4wradwawfrmw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.20"; sha256 = "1c3qz6h1w5wfpl52ys7s29kj338n3wy7w5sn9ghdz5x5vgflah9l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.20"; sha256 = "1zzpj7czk28xip45i3fhhlh3ar0hh3ldar34c6w2vp4psvbdkm40"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "06yzy9spp8d9pz7jihsrcx4rq3n9rcq2j0gq23yhfzp9iip2986b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "0bs2hxyjyhnzvcgx4lplwlvlk7rr5lk0xbncbn8in74pvvjw44qn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0ra55v67748rr0acd22vgg2b31wmkaaghiifi26vwnrhihky9gma"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "1mjj0bfm57anpywknshx8hc1z4xdinjxrxv3zim295w3dpz46y36"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1rqniyhv0i9zim6plbmrhcd9ykwabm5cm7p3mddxr8cgybm1vyfg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "0wdqbzma9fc5sh74a3mcxlrby33qz2hs47kb5c9834qvbjf38fcz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1q5bk01briqlp5bzvkvrq978dzb52np2sp8lv67wjdm7xcbpnfjz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zmsd13dd7vzwxqiznffvk99jqc3fdq3l382ixbr440a006splcr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "1s1girqjlrkz2kqijasmbpfh2fngqiz2i3424i7k9snrzjgnn6ml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "0vmlhgywjhb8k6gi1624fk3q21gy5gsnjxl4f4w8lmaf22zkllvb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "04p7m6csfjqgndi81hpg51gr8pgzqqscnqwgrkkj7nas2ffdxlfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0ky38wy91pprdhbvxp64hz2fmf4kkchw9ldk0i68dnwg190lkjqk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1vs4jirn78v65fn97zx4vz4msq2zrlmiiinh7zl0dpyn0dp68br7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "157z5liy55z3h3qvg9kkmapnldbw7v6qamxdfbk89l3dh7r3m5hw"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "11yv6flr0l49rfa222p35dqv3qbc5jbf7yf28q3x09kv0x2571dn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0nc1mbdk3kafgqayq4zmq0gb5ff0hd9bbn660haadmncn8j44njm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1xzk2kpmps01srj0zyllfc8m65y2l27gpqcmvkh2llkv881kbdfm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qxiv3a7cgga8xnsq8xkvm5qy1spvgwsk57lm54wc6jyhc13fp2j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "14xfisjj5yrqcvy84f30jzvmchp2513afg633bq26irbcy6ilslc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0zdm7bd1z90hn1rvz2k8vwxrzgl7lirmxx4k2ih0gjyp5yz8pkjp"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "18icvgf5avz03qv26ivnmn01fmz345lls0lzgl8n3qr93v40bjf7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00i7adsd6inpgxlr69xgvhsb7sg9g5sscwdmq46z0dp47s1vphli"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1wf0fgz84n6ag81ry4mydkwdzjrsxsfy7rix73hl8ihfy5f2jhci"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0aq5yii9i52i70nkgzm4sb2gcv8i3lw61wl3wbws3lak2van75nh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0glzhxnd4fjf9qjn6knj9gw8j9svxf265sb3qxyl5wnwyqx7rfdx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0ygdldk7xaa12y3y1mrid8v0045j7d2r9gg509m04r2xvan7rhj8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18nmnsh51pslli999g99d52ivsld67nq8kqxccylwj9qmj6cs218"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "14iz67jr1xrshb5vqph3wk5ngnx4a6ingcv868fb98gx13r7wfc8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "00khxrlvfy49s5yxn5611vs24lqhmclzks3pf6wy51rw0fy540q2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00ws9fi2b5wy3jly5pxmgxcjkfmjixmy0m4lw4vp9h4rb8q6prja"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1lp4km2sxjb791srirywf11nyj69654i2s4x4jadbp1kb2r7hp18"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hbxd5nyzngynqvj7n0css7xca7kra5zrdz1g40wvz7hgdacd7j3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0s3g5610m1asz410pp57rlkbcdnsf6rpr9mp8lz34la34w19gkpw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0d509bdgmpjnkxz0gnbssdvdq3rs05k6frs8wpjzm6i5469pxjch"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1ilbsss1w9940wf2jqfgkirf5hn1lqw0p4hpd68r9yryai2s2wnx"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "16sc3gfc3dd0mh86xh3qg00lbdz3yq7f7iyan33rl01z6ljkb3w8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vd3dh0k192r5wf6k11p44sywjkgg4yag3a14y0v8f3lnxm7zqfm"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qdxvknp6ns263r2gvd5iprcdcjvzcwdn2xlkhyy9ihhszkciv3h"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "08pjmzx8qlknq7dci8m5xlldm3jxcj28zlwjs295951zqifzdajb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "17ygzmbcsj1xv5dx63rxb0rvn0laakng7asx0nxsa5pgx28isqdx"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vw0wk0j5alk4ffnp9960cdca2gmlvh9dj553nfxdmnil4vpj7wq"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0k68kxzr0y113rasi0br3jh2f7qjvay61yk6hyizwiz7hikmg12l"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0kdb86h8adc5alsfbh7mii69yc1iyn2k21wf2j90izk8g63qdzsb"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "19327qki08nnvvpqd1lkvisy2wrpcaj3v8d3qq10hyyf21in1ly7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1b8wsdkhpkkm046v9yj23x3jdqygs64bzi9vjslbxg69h6andf2j"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0b0w27az1c97ailrjzdwlpzy7255nmq326gic51vp3p5a05pasrj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18r7k5m6j7xpz4d0cnk74b0alxcgz6v2nz08zdkz1f473s6hdkvl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hi2kg5ka1biczyvg0pk7rvbfb08z5nib7yd18yxzjs7i7hb385j"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1w53abjj2cv39lgc8h4xwf42593cjhiah7vmfi4fc6iyl6q91qg3"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "185vk80j81vckacp0hangng9r2rcw884nirwyvi4p1v0jk66i9g9"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1d01hrwkvf9a64lmv293xf829imghmy4g59s6lkh2dcg96m7byba"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "082zbwg2z2p6fgqy0svd6iahawn1riiqdn4dn63zs6zvjwwc26wg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "16zmi46nkhld8lq1hm5kqndwm0l0w94g352mzammyvrpwsn0wyhn"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "1i9ghy6hvslnh53xdk0xwiq0j92cjim2nyaw3asrqk7rkcynsxz0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.20"; sha256 = "1xh5yqlpwhv1xwng93kw7v345dsmlwpg651zmi1mj95l3qd0p9km"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.20"; sha256 = "0r8s132mgx3283gf1xsg5m4fhc5yy6rkzmii56g52wxpl4si0i50"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.20"; sha256 = "1m8gi6nfy0x5ha2cja7f37237ybb6hd81dcspsb0shmbgag141ab"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0n4fkn7g1zknyalzs9vf3z6x19vrw594qxk1pnianw6db39c9qf1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1nzpshl551sbmpdz8im2rvr8spi0rvdqb2js1kd1988qx2x2jwiz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.20"; sha256 = "00jnmbljs3qhb03d16hh5pqy9na9lij77kgb1wa982lmb80hj7np"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.20"; sha256 = "0c33yyrzfl3p1db7vvd287g7pq3zk14cq1hc8ggpkfr3z3kih8lm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.20"; sha256 = "0fggkfpr591pk5867q01qhijhmj4wks04a77fldjv4iv8azlsn8p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.20"; sha256 = "08fa4s35c08rkj4nk7y2k9flliajvw20i2z7fp4a9dbpsjvkaj9a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.20"; sha256 = "149l8qsjms1zk20xazy6ggcnyhvlbp3rd03lhipd28787jy69d3m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.20"; sha256 = "1wj9piipky41s5z7zwi76ksf8snzk8z9q4vdbl146kkcnaxrkrkm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.20"; sha256 = "19vxwiakqlp299fj62f2ijh8hv67vlk9iz1dg876gvvp06k9mkyg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.20"; sha256 = "1mb4kl2jlk6zsavl979j4z2xmml8kjxnnp3gfmv6rynk7b9m5cwg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.20"; sha256 = "1nz5krmsx7l087gsfpfsmrbwvjjw8qsmb8wcwn5aynljfl4jq7pz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0k9i48w2lh2shfxz0w0qh19yd6y9qg05izhmqb89zpr7m5sccp5v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1xvrmb12fdcrd64bqrs111x170p712aazaqdspbbn5v3j1nbzal4"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0dp54dk7x8zwcgsydfmgn462ynl1809avmn6s22brip0iy7wrz5g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "05h8bg0655scv6crqkygc9iac5vf18cfa2slm52bcsvfvic8ad6n"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0yli4v5nxxizxfz24vk504bvjhngcvvk1ab3jcdirrg9z8pcp73j"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "07indvjgrygh674k50k4isjpr3171h06hfxz2gy99bw3fm0y8lm0"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1qzzxdps0h7dpzz3ks43wzqvb9sqhbrdywzi883ipy7zwndl1avw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "08hfm9xjj6rl1c7zvcxfwsc8qb0d9l66l5j48k311apdc4jjsgg4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.20"; sha256 = "0nz759z6sgmrq29vjr2y04brfjmddr4ga7l5vrsv1k16vf39g3fq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.20"; sha256 = "02wqksvir4r22785w1rrnd4aqjav7asz8wji9v3955acrnhdg81g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.20"; sha256 = "07gsm1p1ccb3f1vc4n024ilz9hc7qnqxj6mwk3k8jbvw228nwi89"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.20"; sha256 = "1p74mcsbq92cbbd5i83clxigcmmhi825q7izpzsypdpd46v73hmv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.20"; sha256 = "13pya2yy68r247fc4r3dbkq2hwaq5909n8v47cr7bvz07mk8isnb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.20"; sha256 = "1xidixl08nys9jzi17w5f89kq9wiwc135ddcbnhpfyhllhrn03kc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.20"; sha256 = "0ypcdzhr3v48iy6c3z6vhi2yfl7rzp85p0smq2pn625c1v1xgmgh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.20"; sha256 = "0py3ydy5pbxzvgi2lmkgcm1f15p6kikcym0hmlaj58ag796b1kff"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 206a1ed9172..ca35bdef1a4 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.8"; + version = "7.0.9"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f452e148-b4ef-4ca7-9d97-59b709c55221/852e848f9fbd345445a0de43efa4e7ec/aspnetcore-runtime-7.0.8-linux-x64.tar.gz"; - sha512 = "b75cb42ecd1936b1b2af5ed59d7f3ef3eb0a602b23f5a272e62c42de9c75db1ae54878b2f9f28d72dac15bdbeaece81cc6344d0df5eae845bc130534ef1bfbb0"; + url = "https://download.visualstudio.microsoft.com/download/pr/c1348fca-4ef4-46bc-9f6e-04f2315e0d3e/50fe6b7c2df482cdc880b66bd46834c7/aspnetcore-runtime-7.0.9-linux-x64.tar.gz"; + sha512 = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/04dc0f8d-880d-4722-bd51-6669e6cd1e72/cd5689508f2da5395bc70473018ff165/aspnetcore-runtime-7.0.8-linux-arm64.tar.gz"; - sha512 = "ce521f56d95c39be6b8428086fb4e0b13ec49b08431bee151a625aeb2366622e6c688abc79b76810bf5c17a8547b894d5ae57539e15ddb3bfbb0e11022c995ea"; + url = "https://download.visualstudio.microsoft.com/download/pr/9aca092c-f9c0-48d7-a01f-3c1c2eaac903/01b345ddecc7a90d5c99d016fa5180a6/aspnetcore-runtime-7.0.9-linux-arm64.tar.gz"; + sha512 = "447ebbd115b8d38eeba70f531010832db535cf3a17404491f552e99a5a59c8c63525640694a6753d27e9a7ed5bf1064998491c1983361c1c37b152b01a3b8f8a"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/755a7169-d77c-42e1-a1a5-1eea4213675d/1375f947547134e9297aba032c3760b5/aspnetcore-runtime-7.0.8-osx-x64.tar.gz"; - sha512 = "46d4e2f36240efa316c15992646d8b93d6750b987aa6bde88529e50c9cbfa69f250148ed6dfbda93c28664c555bda62fac7182a76e8ddddfa1962716169ac152"; + url = "https://download.visualstudio.microsoft.com/download/pr/7e6cb756-70e3-4974-b96c-dc9b9d138306/9b0ea50c629660a565db33e74a69fe8c/aspnetcore-runtime-7.0.9-osx-x64.tar.gz"; + sha512 = "b2cf51cff120abda9b5ae213e294f73debd620bc8f3e6b12e1bb628df31457a5bb8c6dbb12cb1dcec24a2c04edd5ebe807d6761f6095e7a90441f1930acb8185"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/787adeb9-d6c1-4db3-8c72-63653dd939c4/a7aafd0908cf7866c6908a14a78ac994/aspnetcore-runtime-7.0.8-osx-arm64.tar.gz"; - sha512 = "31b9806f7c3d327008fe505dbd627bcccebcc7db7179b7010ac814844782d054975cb4c1a35f6ae447fbed3227d39def95bc99169032f4fcffd35916896ed4cd"; + url = "https://download.visualstudio.microsoft.com/download/pr/f967c09c-7a90-4da9-b933-926ed7870b16/0e5fbf15f170ceaee7e3d1865b856a99/aspnetcore-runtime-7.0.9-osx-arm64.tar.gz"; + sha512 = "fbe725a764b765f9954ae771b3d043d6d1a53e53149d0b4c89a4138793d9471f2924f68a5b8e1c107d9faa07946f2ac00584ded9b179ed8d40cf230ac7d34750"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.8"; + version = "7.0.9"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c9514df2-f03a-45a3-9a6d-65b2260accd1/0f59516ed5bc603ee95ae91301090ebb/dotnet-runtime-7.0.8-linux-x64.tar.gz"; - sha512 = "50463de25360aba18c29ab8a3d31896793a7bcf899b40249fcac77efab24888e93ac906dac04ea5b72026c89c07dd371247ff89e8613123dead7e889906aa876"; + url = "https://download.visualstudio.microsoft.com/download/pr/ecc0d5e3-61f5-49b1-ac1f-3b46956e1139/1ec7760b1697363667623f22a16c67b5/dotnet-runtime-7.0.9-linux-x64.tar.gz"; + sha512 = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc0cbb05-48d1-4f9d-aa78-8f2bf6423f1b/f06a3e717b95abf8ca5f40504cd63dee/dotnet-runtime-7.0.8-linux-arm64.tar.gz"; - sha512 = "92835372558bc9913e81617d0c396a60427fa30eb2dc9249bf73772ee8c221cce7358aaa4cfe5a261849f9b1303225f6052d29187cfbb15cbe3caffbad4fe3dd"; + url = "https://download.visualstudio.microsoft.com/download/pr/f693db81-adb6-4481-862a-887993824572/9bd6d12296a5b07d8b4b0190afab4152/dotnet-runtime-7.0.9-linux-arm64.tar.gz"; + sha512 = "271396af3adf881a4c5c8c28a812f9a0a30e11497bb0c9cec12bee4d726ed9151b2d35eb9146b5938611ab60ccc249d5ce5c870f721f791d19a3b08545dbfa97"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5b7cd80a-49dc-4364-a4e8-a760219548aa/6ba0a83c6da3897dab16ba709acfcc9e/dotnet-runtime-7.0.8-osx-x64.tar.gz"; - sha512 = "e2c01f09a7532d72578dbbc27ea0156b5e0ee0c636eb0503ec34bf4445b0263857063dbd7701a29baa5e74129ec9c7593566f66cb33cccd40ae64ec888d7ba3c"; + url = "https://download.visualstudio.microsoft.com/download/pr/f12bda3f-cef0-4d22-8ffe-89f553b0e5ed/a0ff4b2aeae50d5192e0e6f47075345b/dotnet-runtime-7.0.9-osx-x64.tar.gz"; + sha512 = "104e724bcec68fd77e8f07b71ed364cbcb40394c9ca0d8ef52e1eaab867b579f06ed7b0b203a50bad3df45634d52b6be60829d87a48c1800467f242879f8884e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/11db4f76-fbe9-4692-ba1e-9edd2b5e0eb4/9204a2e30c58c8a01a8a6f7185e6175e/dotnet-runtime-7.0.8-osx-arm64.tar.gz"; - sha512 = "bad440aac7e065c88685de902e5328990d44e60fa8f583d2fcaa38cc9d3cbaf01810cbc40b7cf9275e53f386b59cd88e563f96e907c8b0c0668fa6a905a5eaa4"; + url = "https://download.visualstudio.microsoft.com/download/pr/20e6ef57-7686-4115-b7e6-ac561dcbf4fa/e2bf64248953cb06d5bafd6919f48905/dotnet-runtime-7.0.9-osx-arm64.tar.gz"; + sha512 = "1aae7726b89c0398f29bc49fe9cc4c2c3f27f1114d5ab140c998fe74b13caa3eed05cf5ae28eb389f37de2023b35c3bb864be64a2e596bde673e27ce749c53a2"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.305"; + version = "7.0.306"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/87a55ae3-917d-449e-a4e8-776f82976e91/03380e598c326c2f9465d262c6a88c45/dotnet-sdk-7.0.305-linux-x64.tar.gz"; - sha512 = "c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b"; + url = "https://download.visualstudio.microsoft.com/download/pr/0be7a87e-3a3f-4500-8301-49ccd6f24887/e9e36f35dbaf6625fec3e18f5c2b613f/dotnet-sdk-7.0.306-linux-x64.tar.gz"; + sha512 = "62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e2ca71f5-17e9-4dbd-aaf4-1e0fa225a212/61c440dae017c7129de10cfbfe36fd90/dotnet-sdk-7.0.305-linux-arm64.tar.gz"; - sha512 = "451622fe88ed6c6619be6c27f3e9eeee94ae61db3c9a0b8eab7cf1b14a62d41681181748d823a1207ffb6da6e3a098615aa2f59be8e60d403ba4cb98ab267a50"; + url = "https://download.visualstudio.microsoft.com/download/pr/fb648e91-a4b9-4fc1-b6a3-acd293668e75/ccdc8a107bdb8b8f59ae6bb66ebecb6e/dotnet-sdk-7.0.306-linux-arm64.tar.gz"; + sha512 = "1500927cd2b1e048de8ee5339937fd41073a85a82b7a175220a411212d22e4906b4e5e6d29b51d068157d2ecde33238d540508c700793dca8b04b4d1dcd5c89e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/42115a70-7082-41db-bffa-b54ba38d3a76/5dc32fb8dbd24f358947e96400792bca/dotnet-sdk-7.0.305-osx-x64.tar.gz"; - sha512 = "27762a9104c5f44c189fad2cf81984369503add9c6cbca604a4e539f9957db81d807981ce23c025a74feac1a978b9d679eda66f4078af2de7e0bad5992177700"; + url = "https://download.visualstudio.microsoft.com/download/pr/3d615bde-bfce-4ee0-a3b9-73dc4ea5a472/907ac9c03d971c7577ce60932456b3e3/dotnet-sdk-7.0.306-osx-x64.tar.gz"; + sha512 = "1ba293a9e07819aeb646c86f0db8280394c4a2b62f828d57a5ae80416cbafb1649a22e27cb12cc315dec1600cb825be645777d15e2f7c8d858fac3c55d0ed057"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5514f57a-bdd3-4bf8-aeee-9469379dff7b/8b14cea61057408b04bef7cd94123e66/dotnet-sdk-7.0.305-osx-arm64.tar.gz"; - sha512 = "4567aab659a1900d60f2dc07f6c24954b9fc2c49ea54a75c17825d2b9e131860de33bd79195ae529af1df884a25c7e626d7463d13e340ce6e99a74c8ffe60653"; + url = "https://download.visualstudio.microsoft.com/download/pr/0e57f35a-00e6-49ab-aa75-7ae6711f0a8e/f28c04285b8bfd3f975731a186e23c23/dotnet-sdk-7.0.306-osx-arm64.tar.gz"; + sha512 = "ac8c0b6e9d2235c8ee639c6c50b2f412f808a16f1616964f6166c7c57d899be2a0d8e83dd6f3010634f8f252da483c5d99cb083703996a99a6b9238cdc2cda6f"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.8"; sha256 = "0c6m32c18j2xznkszg85kdik3pc5r07yfxiki4l5i0a4y54ypbjp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.8"; sha256 = "19r888q35cac4rn6mr4fis0y4k3yvsbm117l7a10qgfdglgirxfq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.8"; sha256 = "1nimaxj9f582y0v5ifxcjyhjrv71yl2hqhszpvhgl4js9bj962gk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.8"; sha256 = "1val93qfr2hdas1fsz9f2kifyn6g60np0c4k2kw8a5wl8fmw0kfd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.8"; sha256 = "1w4x1spgb4x57qn3d1m9a3gyqnwwfk952kaxg8bqrki20a7qkhl4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.8"; sha256 = "115yh52g223b45mrlfhspm5jlziq4kcaks20dgk596v0k98mzk64"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.8"; sha256 = "0h4yirhfjsim0qpfh6sh46s6abqilcr2gby4c8aq9zicm8mrilpx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.8"; sha256 = "1mgj49vppwmxmsn4pvlfl72y4cljfc6cyl8difbih5ccg6z1a768"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.8"; sha256 = "1vgl2g9ffppgzac05zacrik9n65y2zr0p09b1ddb31nwkvmw6d9j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.8"; sha256 = "07x477l3l96qp8s5l428a9yl709pp2k0j6ims7ih2wlvcv00yrxf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.8"; sha256 = "02ha9xmgiqqsa20h349gp1gr0i283mpnw9z5639gmg42f5n9bnjh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.8"; sha256 = "0ksdh5vcp7w7cc28cdbw86yxxac2vggl91r84jfc61z0xpry73p7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.8"; sha256 = "0wyq9jhqzy5rzczlbi4fr48z5w3s4v63bjzjq2g7m4j04xp4747a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.8"; sha256 = "1399yd0cjj87i3ihw59dflc3rwlkmlg4562i0fjidj25aidppdm6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.8"; sha256 = "1a6g0rpc78z0fjs4qmsgk5kjxxik9x0ca6czrl26179y8kxqba3z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.8"; sha256 = "1i2mw89q809h4swnhmv33p3wh2sskbkgjkilbvrk01ljbrhi0y30"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.8"; sha256 = "0aw3d5d8hfhk2hsqq776syq6lsqhxcd811zjdyzak7gswbbjgmw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.8"; sha256 = "0f7mi7109pjlmwhky3y813zs3c9579s2xgyfc500y7vs9d0780bs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.8"; sha256 = "1mvh93rq4syp147dz5175dbrbw58lf42hk9mbjinmr6aa1ahxr28"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.8"; sha256 = "1br7fc155k7blg0xnazgimh9szz49lri4gn8jcwqsjzfclanac6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.8"; sha256 = "02qac81akznxacy4v89bmkcxjr9vfa98c40cmagynb6vd60rnzca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.8"; sha256 = "1jlprsgya94lv6agy0s4llcffi3cpv59i2m6aha1m2nh6kd1dawh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.8"; sha256 = "1iygmgc5xrkclkqb0wd7s5ga2as2vy8pnd7j8jdwjnv81m2p778d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.8"; sha256 = "064n292hxr4w3246vfj45v8k8pxghj4cjh02k7rvpjn6g3nnpwhq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.8"; sha256 = "0l209jnikhqc1br5gjwv98pzp7h4amsv7341skzixy7lwamay79f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.8"; sha256 = "1z3n5xw2a8zjvy4w7y6yr1yaig4wdda231yhinkbmhpc80s904sn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.8"; sha256 = "17rh26xs78pmcf9yc3zi3rxx9k3s5fg35xgqq80fvvp88jg9hr5n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.8"; sha256 = "0hp2dsjxg2q3wqnrs8mhfna7pyn9yq55n4rqdydyz2v4d6nsp00l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.8"; sha256 = "0mfgdx7w9l98a1q31mpzcz11p2bxcz5b6ijhrlg3sjkj0wkga7x7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.8"; sha256 = "02xqwf6dry4hrp7agd9av5jmwb7i66bdkzhdq8ngy73zkk5ap1q1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.8"; sha256 = "1whmyzs05751yx5708grmgmiv5i6nbfajhfpryx0h5ipb21csp6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.8"; sha256 = "1rxy9hah8r2l7bkikj6lp36frfvmvz93v96d12k9s7rgxaqzw3p9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.8"; sha256 = "0rl96iw2lp62sxzc2f0y58gj57rwwzq4l1sb2pn8wsrxhjmj0w26"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0jq12zpbwgnwz9hhr269y74m6c8hli311h9km5jwr75kzwbf9rk8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0xplwfghd8mnpmcmvzdrhx78149r3wvsadp3g3k6fvqd2jh6ncky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0l5viqkvm2w5p13dcvpnxpb7g5fsn46p8ay59vcpjmr0k9w8bsis"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0hgb6c235fbapz8h5w3x0jjqgg9ahj4xd3829bm8ziyrv3kq2nrg"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "07z788q2hn2iwb3x1lxblj243ncwif1955hzv4qga5h5a5j97yfr"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0g8g5irxlp5wnrrc7gffac33j6azlig8i0fn0088xhm1lliyaj3z"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1vhgfz5iv0vhn2g970x3zwaa03z7dq63cfv6v6cbrp5l7c640zzd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "08fs6v4sjws0sq3jpy9p12gxg720fq6lvkggj18b4xqz07fmz055"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0br6psv8srk3vxy3swj84in7b1qd030j8y6i0lhd0pjvxmjhqk1y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "11gfspry6l8hnn5mll51p57bdncy72sswcf2544ldig43znawzq4"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0y25h674gvf07x1yvvh7x381b7qx5nlgk3xxyj4awqn6hr0m6rny"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "01rzsnaq9jd2wajmyp28bbxhx318hrkixd8h3vvy3ymanhd5sp74"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "1lfww3pgg8flfgpqi7vjl736k68b12v5iakc67a9nm4kml4z2gsj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "02p3nyyz7mm65vmlafyxrpm1pw4wzryj9z5a4zhvzdlwlddncvya"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "099issp7vpm00ild23571g559mszw11d0za6z5g36n7blywhlj2s"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0zpj8y89qsf2w31api8pj2rjkq5qscvwpr7mwgn2vbh4fl26f63x"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0rwn6lhx5q7ya451dfnlxla9z83lcz87ccxx509qkkdmz7lx3ia2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0n7xwdvacd4dbss1czpwl2z34jyagpkvf1618g59fif0yg29pwv8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "18a2iycwmailkcq0ygac1cpysx2kvp2pdp5z02r6s9jx3mgjpb37"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0gky5dr5b8nzh5f60ik3rr6s2wnbwck4rkalyhgbcbyxkkvcffa7"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0czvd8s0rw7iql4ggwair5wgcvar2sa9rp7m8xcg1bz88dlpswlg"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "16rfmdwqkbmgq286viqmffqd0sm59iw68gf62rw61ab9gdahdfg4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1nqvcpl5jrqw6gh32palk8dn02asp2q77ss91v1v14pdxsx6sc1c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0bj4wxhdcdlxs5cvdkn6fzqwrry7a9kx3cz7ad744qjhhm01lspl"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "096svf8b1v5ki24072y9bx0mjnr3zmpbivhnpxqbnji571nw0cax"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1179n7jg0dz7iik5jdpsfrr2jmzpqd95rw19m1vyqb68qbffy54z"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "00wmjvxdasv24jwhzw6dmyv6rdgd0yz6f1h90yz0yfdxrdbzwipi"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1y8lb60vgiiw7y10qshhm8y7k21q5jz09f8f1sks4p7v987h5l35"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0nnbvn0rxrcq2lisb0a7mn01lb9xk2ixyj9p1xbfrlzgyarl2xvx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1dnn81sa5wrvvdcnnlzg1gf3b5137va8vxfr95lcxd55wh77l71h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0lgzbv71lbh8bj0v260nk4qzkiyvn1bm2kz8as0nq6vlnzvvmnxc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1yxhvx23mn53s37pyz6q370gp056z2hmqd6n0ns8ayxcrr4yx93r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0cf9mx8yk9v2s5hrv1a603sxq0qvd0mxwwi63l9r1g8x7chc432r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "09ymhv03h8ws8idmdj1yff0j1r3hxzbdz7n0n9gpqqdyfj2zs762"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "00byqz0f7dz1ncywzbjiqw6vsia7ia05927xm5h6ykv2a9l635j5"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0sy9kn6n7ccx619fyhyafwgh66rmnyv1s2gz5668hywlcwnbbrhx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "05xim0a1ppzbf7ny6vdfjlrcnh11lqcwydlrdf2l12224kvcmdgm"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0k46q68yp88hj0gkm6q1m4y08vpl49w2pdis160q5jx11fh2bvwf"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0jcx69rq6h6jwlz735qr0pynyadz2nshc6s1xpis6hwc7ysgv0ig"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1prxn6b80nawq8ixqbmdhj6fzsh4mjhhvrkam6r60an38q8pjmqn"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "1xp91d7pkgcrpwalrfl9z9qa72vxg01kbc1k01d7n88ndpair032"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1hl7q1mrp85khz192kqs7lgnhqbl6wv34m2pyj97plm3sqvyfchq"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1sjrs0sc8f9hdqvg94njn3012bcmz87f90ab5dgalhj8m5in394j"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1k5xw1imhsrvj0b8s0zbg1gzbr0r3ja0cql81pq73nc2yk4x5559"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.8"; sha256 = "0sdm16nvckm4xakarnrfb5l075vzbv8vfxz4lk8vy828iqh9sqmd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.8"; sha256 = "16bs4w9gj09zxjmq94l3526mk277360zj6mwapq5mvpn0q9ll275"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.8"; sha256 = "1d3idyw795rpmaklhdn181v3pq9b3m1994jakgmvh2b9hpb4s6x6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.8"; sha256 = "0qx8czk5x0xxx3f6piz4f6nc43j9hkf0i1yidk5pgshk0l5cjgb3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.8"; sha256 = "0mbj34898p2ci2fcdk90gky9abf1kl8jydqgi6czj87hmk4kfdpf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.8"; sha256 = "00l3nvqxpjhhnmdp5yzk2mcm83ibbhcm1dlfxfzbc635f4zqmqrs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.8"; sha256 = "1xcl7sfx3g1zgvj2kwaffh0gqj3cfh641lma25d8mprqw3kms1l0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.8"; sha256 = "1s9khkkmziz63g48afhqh2dsqx6yvwcca0ai83diz4k8zg0wlwya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.8"; sha256 = "0jkxmi3lc5qpgk748mfj9vk5x58j8q60zcrv636xpj06qsm70z6x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.8"; sha256 = "1dflhc1dfral612bdqxhm8dznyphvnl56ywjjak6s9nsjc4q8h0s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.8"; sha256 = "1bp114hzsimjhdwyahph8xlp5aji2in6an6da39i6rwg4j52kgbb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.8"; sha256 = "0sxcmaqrdlvfjwcs7gipyf28r4m93q5059nxjp12pblq4cnsyjpx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.8"; sha256 = "173ld6nc66l1lc7g2j9xkvp3nf8d2w15g05rx8waiksl4k2q8rai"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.8"; sha256 = "1rz3m8x5pnn83z503s4smx775bpap1w43c3a7xvqgnhnqi08pqrn"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0x5rh5y073d2fx3cwbmw1i4rzvyxg8dlgzlny4vy87ycf2qjf2yp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0cg54bp7zx4kfiglbdz4kn767vlii55gzgg8dx0m0zpgcbwnnnsb"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "17jrrw8nkvayjfp4yl0ay8sxg7p46vl9hyx8xbn036clbm1g3ykw"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0fn9jb7kr6y7vhcfzmykgf21kpn6xwfxzc487ynx4rmqvhd24ck1"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0hb9ia3s9llppjnqbzb8cy1zvdbxx1vxcrrj77bmphhmd7rm0582"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1zynb95vlr46zra82dshnmizgq46hg2n1gh3rfwdkdfzznqghbpz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0s4d61ibgs4hvjipp2kqrqafarh561vr5ynyyfrg3vmq2dxl4dgb"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "183yrnyypy3smrvhl1p7srivirbv82f74qizf3sm3259x6cy7h3p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.8"; sha256 = "1m028vv06hx4rnjccm0fya0s888dr2n95qy50alajg2yfsjx5z5d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.8"; sha256 = "0x914n20l9ymszd9zkxfjgkcql8yxpkkywyiqnr47fapnckg9k1s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.8"; sha256 = "065v85x5n2ml7b0zq5aq0n7w941i226alvywxmlr3npskd4dxf1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.8"; sha256 = "04yaar4msmng1kv5irfhk33093x9wy9j886ba6a2b875fv8bccvx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.8"; sha256 = "1shcpziwrjs8s6w6c8k35ksaynqj50w50mxbaz5x0abx8zm0171w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.8"; sha256 = "1855g78y2xr55l8wg6g3268bs99v4yky3ablyskbzh9fcd69f12n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.8"; sha256 = "1z4z1vwfx8lim0k754wn4l6smx2wbfn3izmla32zbp7azf7wz4mf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.8"; sha256 = "0z636krp140rz3gvd7n2aqvsr9wlg3r05fl1nal81aaplazpjllc"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "108ifhifj7dv0650xciylgnm3y1405mrkfvk21b0bbjva6ng59sx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "07qljs56khdm4jlh3ack12xx7jp0dxmihdihcnv653bllys1ay9f"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1lghi90zb4xswp3v03vbb7hbjixr2jq3s1cxhl35qrg5qm1rib5g"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1yva9fnnrs1cn4n3y0k0ji24nnysg7x0grj54qknf3anv3nsl8z9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "0ng2ck1na9v25an5b3jwk1ahr5n5habp0sg2fzqdyjms1y1bx7c0"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "03iw2kk1w2bk2jgi76bfw5xq8pjv6fzxac3ll5b3vfxc2b0wn8p6"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1c9289fprnb4xhf3ayj2rnhmc5z7narrxxfrjfsr8skprkdcidfs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "09d86p5r8wbv03f89cylkg6czwf71m50fkxmav9qp3p5cscayzql"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "01nkzvwgrlmgw57llabdgfxqz7jp54a2p3fd83zdlajqmmf54wi5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1z0cbmff7kmv8yg9x9j4jzga689fy4434z8jy8s3vjsvmcj96wmc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "0059ldcym4lwrifibhb8qlra2f3ygzb95laxjgxj3jbdh78fy3i8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "12wkvz1mwyxv7zcr18bsyfa93p0wjmxqyz26va34xrfws699ip1v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "1spnj5n5l0hksrq89blj0xcsp1cnk2dw8n0giqrmq790yssvzn16"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "0paqgqbddlnz6p0q1rmc8rdxhgwhs2gqnhbq8b53c0pn8dv554nz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "0zw8bqj770gzk03ddxxh2y69krgxvrxn646878lf0l8ssllbsp5v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "0zm2gly0pkm5x0zngcbbz060i2p5xssrb154pnix9xbhpxf9bab7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "019fpgx8vminim43x3j4ym0m3fg42r8igw4yhh6ivbfkzyy5jnkb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.9"; sha256 = "1vsrymzxfrsa3dvmia9wgvyyz1s8h3n76qwcysa78dqf6lkas77s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "19wzv0rwddcnrkz0g10gqya0l1brpajkg1krpcf8br0ly0n6fddi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1l3g7l5xzcw3hpk3mcwsl6g72qfrs0m3blazrngma73z4cj3k9bi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.9"; sha256 = "1cl0xj4aafsfsvms4il6nrx8dyfwx0wdykwzrr2azy2yxvymqslr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.9"; sha256 = "1ckgzrwi67prsab6zrjjm0zmf6mbk7wzjjg197nnrjfd6sp5dpq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.9"; sha256 = "0ymj65d1fjn7mm5w2myrhrq465xsr1nggnvpmbfr5md9g9zz78h9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.9"; sha256 = "0jhcajp4dy3770y5394rapsjl6z7jfdw8c2wnsqdr2cgzwjcjr3s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.9"; sha256 = "1rprrl8qbdn9v3j7k2dkh0krmr9bak8k3r5lm9v43f1h85gcicsk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.9"; sha256 = "0vgn0gd31xfk4j7a8grnnbn3sc8afbncxzcfykzlrpqmzn61plvm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.9"; sha256 = "00v7yivfj6vl2w0cxnw03pdqwbqz55ds32nanqmni069466x8aya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.9"; sha256 = "139lkp92clq50d3jcpdlv79mx72fi46q7bb9skbgc6svz9d40x4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.9"; sha256 = "0dbwkh60f4sbfxsfzi5kyhc7aiz6f9bx3p0m5h897pp94xz7gqrl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.9"; sha256 = "0v6ln2cbh09nsglkcclay9jkxchnlg89qkzxmw2ml353b42an1ca"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "0kp2zhxq7dhsclb57ah3xw7ahp23n2xx1lxxmqkmw8gqgan99jwf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "0d380v98ncgbjzhrd3pf6ff2155rbl173sr686ifs8djl1w86q24"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1f1cjqw2wxdykynj2vkxlhqk7kw058219yydyjsgpczrxpdqmcqa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "1kd4xdwwck1yjb2j4zwj6xq7b6skbc5x565mpzki8s0x2pncid7s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "15fw7ywbn28asnn6d23rl5bljzx6crxq8nj0iv7l24c96l41pi55"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "0k5iqm0hq9f9nwq9sazld3ada7zx2wypcf5k2ddhrwr53wr3rb2v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "1nmb8hjln8y061381rii1q0m8ipbip51wciypdgvngzvjsibhsgs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "16advlismh4qki0dslnycicy73xlhjm3cv595v8yldrvynam2bdp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "1lxn13pvg2zynwnzxriw6izdq778w004m5ijxircn1mhzrziipz9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "1659734dxb42pcyjsbdg1r9m13z59qm1kd6c23dpix2dwfn2jnrw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zyrafkqv54fd03m8pn7gly2svh8lpsfkbf8cr962w56g7m900qd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zsshmfjm8ivh34qgb6jcmrd5lv9c8lb40k9splg0d3vi9769kdk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0lgfaqqjsijvjspz2as5c5wjcgpl38pqyvy016b6bq0pii3008xg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1v1vq51isgmj15x6p9jmilvgh8kv75748ga7ba9d9azjcia6dj18"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "14z8nr5h8aw5090xwd5ll82c9j936fhadf9k0skb8rghkwqlak0n"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "10vkpyfp5v9nv2rcwbi20874a6swqzgzn7w4y5zkx51q9a2r80yb"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "064yry4gplxjsxn46ardi9jzvpmm77b0pgv9izhdlp5jgnxp8hrf"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1jzasfcy1rmn6vmsm5i96srp04ha6nv4a564p09wam1xjqspm3fc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1gri5l2gbxkbhhjxkzwa4wnyrm522pimpl8ad2nhq2mpa62kmk20"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1jimxwgx5b311y1nxchyxg7yabkns6xlhx9sc0ha6nyv9m9bbn4y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1ml6kb8m6l64gvf2igh0cqbhgk51n1alqq1zn1hfcg695wm0ldxy"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "17ls7hkmmiagdfrvrh2w089pi24xjyg5w5xbxzwagv65aff0m50z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "02n69ki00djz3504sfz26akgyk2m0bqd3cmpl3553sh68igqaqnr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1cwsl8abvb5bvkciyb29jv0cbc9yr5gbsv4d16q7sifhmhsj7ccj"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "17vfj41qza3l6vslq5zb8d8wj9mn23d3z6g2flb8spdlvvrc23mn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0lcx0zwdryw2jzv61jaqhslc3iglg2kc6lcxqs746vhwsqd40fcd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1cmjc993gfrxijk4mkfjvhz2zs146353rhg3948gal2r6gdqnqba"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1pp2fgk7c0gdjqmdxddj0xw99akrqpw8hx1wsj4x6yx5f3p3hgay"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p06lmfip9iz934sdvql4iir9ln6n59f0bwwg40i4fldvpfgrf6x"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1gzfypb84x6wr3rrywr5m1lv0a77wz56vzczb6c5kgad9dgjxnhz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "062xbr09j64bh8qmq77mhdpkd12b1xn8282xyvbxb9svpgy5q3in"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1mjvzpsbr8ikbd6417y81bwfn1fa5g4i1hb6yv3spxgl45rpqy7j"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1fpl01yq1ha0912sr5wj3rwg29q3jknhdaibw92ql8jdmbwp6z1b"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1zxcy12nbpfhc7a0p3vmi645p79gnqi7g4jjd9ap7rg57b56wd0b"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "15qvi3x575976hs2xqrr0z68mi8v8cpal64sc669njlfprk0rsw5"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zr89aaxz4qlqk0fi4xqwv138k54lskwm219iacpkjvci88brc82"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "07dasy4d7bnirkb61mirnjvgvw7l2266wi4bb69vfiq0gzfzbzr7"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1iiba4mkvhcbf1lc9ydmafxzd75mfxw16d3q4nm3mravf88hga4j"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1pvrz3gd1p7ihnhfgl1hlhxy6f90238alw4v0gdwcfqbxlnnfvyh"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ammp0lxban03aam1i5mhfqh0lpc31d9qpy08i1qzs8dpy0qy8kc"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1gl2j9n3h0fhx4dpcq3lwvcnx5xirdsjs4vq0jph01zfxsvn9rh5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0zkdalcb30dpv0682cdf0ib5hyz8ic4yksp0kj1ybrgj6wmnhgr7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "0m0m7cja0s1sza51qz2300c8m4397ii5p5nppm9nvx1cqhhrxyq1"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ds54pnkn9x5nyngdkkymwkg8k0wy3g4jpb098h0hm8pv1pikvz8"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p20jsz3h5rssiq6wdf1i0m5fb52y3l2a7d83j5s3fllvf1hpv5m"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0s6i21a8raazrw4cm4cs1jjxmpqmazrdjsa7xgk8j6r71galml9h"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zxkvw32d099pjnkdza7jmfyxs8q9j46qhn3i0g2b01m7rla1nh4"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ckx746lmb7m952c27hwrnf4ngzx5zk310rpgdk1v74n767n2l4q"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0jrh9507aa2m82i7b8i4ws7rx3fpbdlcfgr7qrv6046myipx847x"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1arfqghv2v13knh95k300vllx3rnb6rjfn8h0k5qyvgcha5dxjhs"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1qvr9xd8564bg6zq4qzgjvs1yy6cvpb6k6rbzcrffa0ql6mp5whh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1vnb8719i9j1x3nkl7hc6wrcc0w98xiwj2bhaxxwcxjhnqid2kjv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0d9czhxn25322iqmn5lhv9bwnznlcnr1rsvq52y6h3ks4lqbpx6d"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1k3abndg0gxji09wwvnnbi4d8m3xk51yc2hir08vb064i28x0vwd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.9"; sha256 = "1phh09w8x6i4w15rjrgc74pljaqrrh4cc2g2vaymffx32nbd8b0p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.9"; sha256 = "10h6gmf8f600qir9b282d9c3890b1jjkqkiv2h1x899cibx3r4xz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.9"; sha256 = "1199dqdkd9q568scprvbjpqqnjh7476vwykjj3wl242ljc9lzv07"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "06q2r3sfj2g7r564q1ys0ny11dg3qz6nifrby9phijs1pwcrsf7l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1cw4cm7hr4x3niynbxc0z4lwn8lmd78x00vmb1kq52gvy24vnpvz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.9"; sha256 = "1jkv8a4apfjq7xjlw7mkap3h1znrmwb7kb175krslp9arldh9lc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.9"; sha256 = "128gc9zy607ybhs58hc49lvwg1ddlmz3s6ak4qdibpjzxgaxd444"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.9"; sha256 = "0cgbxm4w10kxdjil8bl04d7py0gbccs5npaxnji0xi45977ajs32"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.9"; sha256 = "1vz7a4jk3l1xgihv812y198c0kwgbvl9fh21r32jm363dxrd2lrb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.9"; sha256 = "05vhl80v3m3jql0r72ba15gd1q4p1zzc709klzr3wv50zsjqpcgp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.9"; sha256 = "1sn6qxc57fr5w9hh9x37v6z0pgwch8hhm5jzjchyflkdj9g60zc6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.9"; sha256 = "1kxjwrqbrkwyigyynlcl8lip10rmp029qikiifq5mm6j0ifyashr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.9"; sha256 = "15h20x40x14grk7d9jacgi3kfrrlkszg5mxf5mcm0ycphp9cq4h7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.9"; sha256 = "0x9zkfp3917wwaz20c1x6yp22iv4zj6778l38m9xbhynsjiak33m"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "025znra1878vbq7ywchjnc2jq1xsqnl3lkij5qacjh13a7zg8jcs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1aaxyyg4f7apb5naj8fj72mh3jzh6v0rdmmgjrx467z471y0ccss"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "11gj2kk8h4jpzgs0hyxa1pgsxw29y04q33c3n70bgsnjd6qrrprl"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0x58n7zl28973w2rbl7zjpwqvfq3vpr639zi78654sj0xjvqgd9f"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "08p00883gf1xinwp36axld678ab039raqj6gbyya0bh8wcybwksz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ck7fqjp6xgnl399lhdp2lqz7zj2awx13dvxbyvql0iv2iyim986"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1257h215aa87irl6pd64sa1600kmhhdv1l545jlv4x7hm0jqy63p"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "139ccsmjg8bgh7f318h921lv8g4nbhrycj0b3h7r8nxpg484inls"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.9"; sha256 = "0jg2qnm2wj7bwzgdw656sbvn8radsg9r7nvbsk06w6kn053kpnzs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.9"; sha256 = "1d633c6a8qyj5lsv6sjl1yb9j8pinkyv4m6qysffzz1swkzg2fn2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.9"; sha256 = "190n60bzlwsrrs1pr79va4qxbh0vj2zshjpw8wa3ypbfgw9nwfqr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.9"; sha256 = "0lg0hncd3f79z5rpldk3751q1k08dmn4nyzmg85ivci5xp2glmc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.9"; sha256 = "0ldwqi394i7dancwz46d1g5w7w2d681k0qbb21wnn0l8llairmsz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.9"; sha256 = "1s6g2agg0yjzxppzrq06zg53ik3nk40pv2py3r91vvm9as10l0la"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.9"; sha256 = "1a3yv46jkpakpd35qbnyx0rik1w90wmpbffd2sx919pl77l262kq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.9"; sha256 = "1p7rmjsjyginrx6ml3j0pmlvghp6rhi7p2myn6di1lawi4c245sp"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0hpbb13459izw1c5qw7lh1sy5fbnmg7n8977jci5far584zbf3im"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "162pjnjp7k5y1xckl0l7h06yv2d65lczwspqfcyy1ix7whx8l5fm"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0kikz4mgymxdjpg3xwlzwb5b7qdq550qf4rknaik2qklwr2xv7xr"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0crf80nb3pw4wr83bvsx7f48i63f2l1b2zc18sny4xhqlvbcfick"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1370mahfnshdy63vlxbyqpbhmv5rby5azfbnyc72xb7zglf9aqcb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1v3knzlfb6ik4306lhk5d37pfmpxczl0d4h2flvvzs61ap1jpgh6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "10a0gk0nqx3p9xjaxlwlx6hkvnjps2dyfih91nf10dw31w40q4h9"; }) ]; }; } diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index e73542263df..cd8d4572a15 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -251,17 +251,6 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { done fi - # Cross-compiler specific: - # --with-headers=$dir option triggers gcc to make a private copy - # of $dir headers and use it later as `-isysroot`. This prevents - # cc-wrapper from overriding libc headers with `-idirafter`. - # It should be safe to drop it and rely solely on the cc-wrapper. - local sysinc_dir=$out/''${targetConfig+$targetConfig/}sys-include - if [ -d "$sysinc_dir" ]; then - chmod -R u+w "$out/''${targetConfig+$targetConfig/}sys-include" - rm -rfv "$out/''${targetConfig+$targetConfig/}sys-include" - fi - # Get rid of some "fixed" header files rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h} diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b06282495c0..f124cb4d4e6 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc="; + sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3"; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index ce31fe08195..8e723cdb821 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_GTEST=ON" "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index fd3d1a810a5..872f16549d8 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.9"; + version = "0.15.10"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -25,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "16ci26pgrw0zmnyn1zj129y9624cqwzrhqglc8mgfg4k7rxvqy2a"; + sha256 = "1pk6mkjy09qvh8lsygb5gb77i2fqwjzz8jdjkxlyzynp3wpkcjp7"; } else fetchurl { - url = "https://123.github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + sha256 = "14yd00v3dsnnwj2f645vy0apnp1843ms9ffd2ccv7bj5p4kxsdzg"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "0rabinklsd8bs16f03zv7ij6d1lv4w2xwvzzgkwc862gpqvz9jq3"; + sha256 = "03p5f2m5xvrqgiacs4yfc2dgz6frlxy90h6z1nm6wan40p2vd41r"; }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 934a57cf062..53f7257ecfc 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" "--set=build.cargo=${cargo}/bin/cargo" - "--tools=rustc" + "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 809b36ce35b..f34992c8a36 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -1,22 +1,26 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook -, ncurses6, zlib, gmp -, makeWrapper +{ lib +, autoPatchelfHook +, fetchurl +, gmp , less +, makeWrapper +, ncurses6 +, stdenv +, zlib }: stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - milestone_id = "M5b"; - version = "1.0.${finalAttrs.milestone_id}-alpha"; + version = "M5b"; - src = if (stdenv.isDarwin) then + src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-macos.tar.gz"; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; hash = "sha256-Uknt1NrywmGs8YovlnN8TU8iaYgT1jeYP4SQCuK1u+I="; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-linux.tar.gz"; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; hash = "sha256-CZLGA4fFFysxHkwedC8RBLmHWwr3BM8xqps7hN3TC/g="; }; @@ -25,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; dontConfigure = true; - nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook); + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses6 zlib gmp ]; installPhase = '' diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 213a4762620..a25142fa9fd 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.30"; + version = "0.31"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-qhMcXJFEuBPl7vh+gYTu7PnSWi+L3YMLrBMQyYqfc0w="; + hash = "sha256-BGeqI0U2AdKgsQQw3f/C0l1ENPTlQ3Eoa8TaLRE+aWI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index c62e20a5a2e..c459ef2ea5c 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -3,11 +3,17 @@ mkCoqDerivation { pname = "bignums"; owner = "coq"; - displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if lib.versions.isGe "8.6" coq.coq-version - then "${coq.coq-version}.0" else null; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.13" "8.17"; out = "9.0.0+coq${coq.coq-version}"; } + { case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; } + ] null; + release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY="; + release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE="; + release."9.0.0+coq8.15".sha256 = "sha256-2oGOANn3XULHNIlyqjZ5ppQTQa2QF1zzf3YjHAd/pjo="; + release."9.0.0+coq8.14".sha256 = "sha256-qTU152Dz34W6nFZ0pPbja9ouUm/714ZrLQ/Z4N/HIC4="; + release."9.0.0+coq8.13".sha256 = "sha256-zvAqV3VAB7cN+nlMhjSXzxuDkdd387ju2VSb2EUthI0="; release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw="; release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4="; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; @@ -21,7 +27,7 @@ mkCoqDerivation { release."8.7.0".sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; release."8.6.0".rev = "v8.6.0"; release."8.6.0".sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - releaseRev = v: "V${v}"; + releaseRev = v: "${if lib.versions.isGe "9.0" v then "v" else "V"}${v}"; mlPlugin = true; diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index 75d57936ff5..78f76bd1b89 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -7,9 +7,15 @@ mkCoqDerivation { owner = "Lysxia"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.16" coq.version then "0.4.0" else null; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.17"; out = "0.4.1"; } + { case = range "8.8" "8.16"; out = "0.4.0"; } + ] null; + release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; + useDuneifVersion = lib.versions.isGe "0.4.1"; + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.mit; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8991787873f..297beaf950e 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.17"; out = "0.11.7"; } + { case = range "8.11" "8.17"; out = "0.11.8"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } @@ -13,6 +13,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 8a30fbeb961..a2c9ea3deda 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -11,9 +11,11 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.17"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; + release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA="; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix index ba66c4f86ef..e08d7b8d50c 100644 --- a/pkgs/development/coq-modules/trakt/default.nix +++ b/pkgs/development/coq-modules/trakt/default.nix @@ -4,12 +4,16 @@ mkCoqDerivation { pname = "trakt"; owner = "ecranceMERCE"; - release."1.0".rev = "d1c9daba8fe0584b526047862dd27ddf836dbbf2"; release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY="; + release."1.1".sha256 = "sha256-JmrtM9WcT8Bfy0WZCw8xdubuMomyXmfLXJwpnCNrvsg="; + release."1.2".sha256 = "sha256-YQRtK2MjjsMlytdu9iutUDKhwOo4yWrSwhyBb2zNHoE="; + release."1.2+8.13".sha256 = "sha256-hozms4sPSMr4lFkJ20x+uW9Wqt067bifnPQxdGyKhQQ="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version ] [ - { cases = [ (range "8.13" "8.17") ]; out = "1.0"; } + { cases = [ (range "8.15" "8.17") ]; out = "1.2"; } + { cases = [ (isEq "8.13") ]; out = "1.2+8.13"; } + { cases = [ (range "8.13" "8.17") ]; out = "1.1"; } ] null; propagatedBuildInputs = [ coq-elpi ]; @@ -17,7 +21,7 @@ mkCoqDerivation { meta = with lib; { description = "A generic goal preprocessing tool for proof automation tactics in Coq"; maintainers = with maintainers; [ siraben ]; - license = licenses.cecill-b; + license = licenses.lgpl3Plus; platforms = platforms.unix; }; } diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix new file mode 100644 index 00000000000..9758b6a2bc3 --- /dev/null +++ b/pkgs/development/embedded/blisp/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, argtable +, cmake +, libserialport +, pkg-config +, IOKit +}: + +stdenv.mkDerivation { + pname = "blisp"; + version = "unstable-2023-06-03"; + + src = fetchFromGitHub { + owner = "pine64"; + repo = "blisp"; + rev = "048a72408218788d519a87bcdfb23bcf9ed91a84"; + hash = "sha256-hipJrr0D4uEN2hk8ooXeg0gv0X3w4U9ReXbC4oPEPwI="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + argtable + libserialport + ] ++ lib.optional stdenv.isDarwin IOKit; + + cmakeFlags = [ + "-DBLISP_BUILD_CLI=ON" + "-DBLISP_USE_SYSTEM_LIBRARIES=ON" + ]; + + meta = with lib; { + description = "ISP tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; + license = licenses.mit; + homepage = "https://github.com/pine64/blisp"; + maintainers = [ maintainers.fortuneteller2k ]; + }; +} +# TODO: update when next stable release supports building without vendored +# libraries diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 50e1ac50597..09eb1512f4c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3061,7 +3061,6 @@ broken-packages: - l-bfgs-b - LC3 - lcs - - ldgallery-compiler - ldif - ld-intervals - leaf diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 32c72dba6ca..83824730c81 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -327,8 +327,6 @@ package-maintainers: - tasty-expected-failure - lhs2tex - rec-def - pacien: - - ldgallery-compiler peti: - cabal2spec - funcmp diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index beb81a58d86..fa0446148b4 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -9,8 +9,6 @@ self: super: { dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; - ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { }; - # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated # from the latest master instead of the current version on Hackage. cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { }; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index a7f89c1f87c..545f7de95b1 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.28.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QfW17BDP+xa+Qy9FuIioe8UY6BBGsvbSyyz6GFODg5g="; + sha256 = "sha256-waBOPrcZ1mNsvb2PrivYUmbUKv1mxD/rMFOCZXslyKA="; }; postPatch = '' diff --git a/pkgs/development/interpreters/perl/MakeMaker-cross.patch b/pkgs/development/interpreters/perl/MakeMaker-cross.patch deleted file mode 100644 index 40626c51f9b..00000000000 --- a/pkgs/development/interpreters/perl/MakeMaker-cross.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2017-06-30 17:03:20.000000000 -0400 -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2018-02-28 10:06:37.031237946 -0500 -@@ -1267,7 +1267,12 @@ - my $value = shift; - return $value if $UNDER_CORE; - my $tvalue = ''; -- require B; -+ eval { -+ require B; -+ }; -+ if ($@) { -+ return $tvalue; -+ } - my $sv = B::svref_2object(\$value); - my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; - while ( $magic ) { diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch new file mode 100644 index 00000000000..e0f05ede90d --- /dev/null +++ b/pkgs/development/interpreters/perl/cross.patch @@ -0,0 +1,250 @@ +From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de> +Date: Mon, 10 Apr 2023 22:12:24 +0200 +Subject: [PATCH] miniperl compatible modules + +CPAN::Meta +ExtUtils::MakeMaker +JSON::PP +Data::Dumper + +Updated for perl v5.38.0 by stig@stig.io + +--- + +diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm +index b0e83b0d2d..dab4907704 100644 +--- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm ++++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm +@@ -86,21 +86,7 @@ sub new { + # from version::vpp + sub _find_magic_vstring { + my $value = shift; +- my $tvalue = ''; +- require B; +- my $sv = B::svref_2object(\$value); +- my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; +- while ( $magic ) { +- if ( $magic->TYPE eq 'V' ) { +- $tvalue = $magic->PTR; +- $tvalue =~ s/^v?(.+)$/v$1/; +- last; +- } +- else { +- $magic = $magic->MOREMAGIC; +- } +- } +- return $tvalue; ++ return version::->parse($value)->stringify; + } + + # safe if given an unblessed reference +diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +index 746abd63bc..c55d7cd2d0 100644 +--- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm ++++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +@@ -1,6 +1,7 @@ + use 5.008001; # sane UTF-8 support + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e + # XXX-INGY is 5.8.1 too old/broken for utf8? + # XXX-XDG Lancaster consensus was that it was sufficient until +@@ -650,27 +651,29 @@ sub _dump_string { + join '', map { "$_\n" } @lines; + } + +-sub _has_internal_string_value { ++# taken from cpan/JSON-PP/lib/JSON/PP.pm ++sub _looks_like_number { + my $value = shift; +- my $b_obj = B::svref_2object(\$value); # for round trip problem +- return $b_obj->FLAGS & B::SVf_POK(); ++ no warnings 'numeric'; ++ # if the utf8 flag is on, it almost certainly started as a string ++ return if utf8::is_utf8($value); ++ # detect numbers ++ # string & "" -> "" ++ # number & "" -> 0 (with warning) ++ # nan and inf can detect as numbers, so check with * 0 ++ return unless length((my $dummy = "") & $value); ++ return unless 0 + $value eq $value; ++ return 1 if $value * 0 == 0; ++ return -1; # inf/nan + } + + sub _dump_scalar { + my $string = $_[1]; + my $is_key = $_[2]; +- # Check this before checking length or it winds up looking like a string! +- my $has_string_flag = _has_internal_string_value($string); + return '~' unless defined $string; + return "''" unless length $string; +- if (Scalar::Util::looks_like_number($string)) { +- # keys and values that have been used as strings get quoted +- if ( $is_key || $has_string_flag ) { +- return qq['$string']; +- } +- else { +- return $string; +- } ++ if (_looks_like_number($string)) { ++ return qq['$string']; + } + if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { + $string =~ s/\\/\\\\/g; +@@ -800,9 +803,6 @@ sub errstr { + # Helper functions. Possibly not needed. + + +-# Use to detect nv or iv +-use B; +- + # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? + # Some platforms can't flock :-( + # XXX-XDG I think it is. When reading and writing files, we ought +@@ -822,35 +822,8 @@ sub _can_flock { + } + } + +- +-# XXX-INGY Is this core in 5.8.1? Can we remove this? +-# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this +-##################################################################### +-# Use Scalar::Util if possible, otherwise emulate it +- +-use Scalar::Util (); + BEGIN { +- local $@; +- if ( eval { Scalar::Util->VERSION(1.18); } ) { +- *refaddr = *Scalar::Util::refaddr; +- } +- else { +- eval <<'END_PERL'; +-# Scalar::Util failed to load or too old +-sub refaddr { +- my $pkg = ref($_[0]) or return undef; +- if ( !! UNIVERSAL::can($_[0], 'can') ) { +- bless $_[0], 'Scalar::Util::Fake'; +- } else { +- $pkg = undef; +- } +- "$_[0]" =~ /0x(\w+)/; +- my $i = do { no warnings 'portable'; hex $1 }; +- bless $_[0], $pkg if defined $pkg; +- $i; +-} +-END_PERL +- } ++ *refaddr = *builtin::refaddr; + } + + delete $CPAN::Meta::YAML::{refaddr}; +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +index 3604eae402..991f69d275 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +@@ -1,12 +1,13 @@ + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + package CPAN::Meta::Merge; + + our $VERSION = '2.150010'; + + use Carp qw/croak/; +-use Scalar::Util qw/blessed/; ++use builtin qw/blessed/; + use CPAN::Meta::Converter 2.141170; + + sub _is_identical { +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +index d4e93fd8a5..809da68d02 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +@@ -1,6 +1,7 @@ + use 5.006; + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::Prereqs; + + our $VERSION = '2.150010'; +@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; + #pod =cut + + use Carp qw(confess); +-use Scalar::Util qw(blessed); + use CPAN::Meta::Requirements 2.121; + + #pod =method new +@@ -168,7 +168,12 @@ sub types_in { + sub with_merged_prereqs { + my ($self, $other) = @_; + +- my @other = blessed($other) ? $other : @$other; ++ eval 'require Scalar::Util'; ++ my @other = unless($@){ ++ Scalar::Util::blessed($other) ? $other : @$other; ++ }else{ ++ builtin::blessed($other) ? $other : @$other; ++ } + + my @prereq_objs = ($self, @other); + +diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm +index fc8fcbc8f0..cda7b90c65 100644 +--- a/cpan/JSON-PP/lib/JSON/PP.pm ++++ b/cpan/JSON-PP/lib/JSON/PP.pm +@@ -4,6 +4,7 @@ package JSON::PP; + + use 5.008; + use strict; ++no warnings 'experimental::builtin'; + + use Exporter (); + BEGIN { our @ISA = ('Exporter') } +diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm +index bb6d3caedb..0c2fde4743 100644 +--- a/dist/Data-Dumper/Dumper.pm ++++ b/dist/Data-Dumper/Dumper.pm +@@ -11,6 +11,7 @@ package Data::Dumper; + + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + #$| = 1; + +@@ -125,8 +126,7 @@ sub new { + # Packed numeric addresses take less memory. Plus pack is faster than sprintf + + sub format_refaddr { +- require Scalar::Util; +- pack "J", Scalar::Util::refaddr(shift); ++ pack "J", builtin::refaddr(shift); + }; + + # +@@ -282,9 +282,8 @@ sub _dump { + warn "WARNING(Freezer method call failed): $@" if $@; + } + +- require Scalar::Util; +- my $realpack = Scalar::Util::blessed($val); +- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; ++ my $realpack = builtin::blessed($val); ++ my $realtype = $realpack ? builtin::reftype($val) : ref $val; + $id = format_refaddr($val); + + # Note: By this point $name is always defined and of non-zero length. +@@ -576,7 +575,7 @@ sub _dump { + # here generates a different result. So there are actually "three" different + # implementations of Data::Dumper (kind of sort of) but we only test two. + elsif (!defined &_vstring +- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) { ++ and ref $ref eq 'VSTRING') { + $out .= sprintf "v%vd", $val; + } + # \d here would treat "1\x{660}" as a safe decimal number diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3c57d8a2b69..a2f9862083c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -58,18 +58,18 @@ let in rec { # Maint version - perl534 = callPackage ./intepreter.nix { - self = perl534; - version = "5.34.1"; - sha256 = "sha256-NXlRpJGwuhzjYRJjki/ux4zNWB3dwkpEawM+JazyQqE="; + perl536 = callPackage ./intepreter.nix { + self = perl536; + version = "5.36.1"; + sha256 = "sha256-aCA2Zdjs4CmI/HfckvzLspeoOku0uNB1WEQvl42lTME="; inherit passthruFun; }; # Maint version - perl536 = callPackage ./intepreter.nix { - self = perl536; - version = "5.36.0"; - sha256 = "sha256-4mCFr4rDlvYq3YpTPDoOqMhJfYNvBok0esWr17ek4Ao="; + perl538 = callPackage ./intepreter.nix { + self = perl538; + version = "5.38.0"; + sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; inherit passthruFun; }; @@ -77,8 +77,8 @@ in rec { perldevel = callPackage ./intepreter.nix { self = perldevel; perlAttr = "perldevel"; - version = "5.37.0"; - sha256 = "sha256-8RQO6gtH+WmghqzRafbqAH1MhKv/vJCcvysi7/+T9XI="; + version = "5.38.0"; + sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; inherit passthruFun; }; } diff --git a/pkgs/development/interpreters/perl/intepreter.nix b/pkgs/development/interpreters/perl/intepreter.nix index 6d543e7d840..1e0c87ddb9d 100644 --- a/pkgs/development/interpreters/perl/intepreter.nix +++ b/pkgs/development/interpreters/perl/intepreter.nix @@ -63,16 +63,16 @@ stdenv.mkDerivation (rec { disallowedReferences = [ stdenv.cc ]; patches = - [ - # Do not look in /usr etc. for dependencies. - ./no-sys-dirs-5.31.patch + # Enable TLS/SSL verification in HTTP::Tiny by default + lib.optional (lib.versionOlder version "5.38.0") ./http-tiny-verify-ssl-by-default.patch + + # Do not look in /usr etc. for dependencies. + ++ lib.optional (lib.versionOlder version "5.38.0") ./no-sys-dirs-5.31.patch + ++ lib.optional (lib.versionAtLeast version "5.38.0") ./no-sys-dirs-5.38.0.patch - # Enable TLS/SSL verification in HTTP::Tiny by default - ./http-tiny-verify-ssl-by-default.patch - ] ++ lib.optional stdenv.isSunOS ./ld-shared.patch ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ lib.optional crossCompiling ./MakeMaker-cross.patch; + ++ lib.optional crossCompiling ./cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -123,7 +123,7 @@ stdenv.mkDerivation (rec { dontAddPrefix = !crossCompiling; - enableParallelBuilding = !crossCompiling; + enableParallelBuilding = false; # perl includes the build date, the uname of the build system and the # username of the build user in some files. @@ -150,6 +150,7 @@ stdenv.mkDerivation (rec { LIB = ${zlib.out}/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT + USE_ZLIB_NG = False EOF '' + lib.optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" @@ -234,14 +235,14 @@ stdenv.mkDerivation (rec { priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022 + crossVersion = "1.5"; # Jul 03, 2023 perl-cross-src = fetchFromGitHub { - name = "perl-cross-unstable-${crossVersion}"; + name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-m9UCoTQgXBxSgk9Q1Zv6wl3Qnd0aZm/jEPXkcMKti8U="; + sha256 = "sha256-9nRFJinZUWUSpXXyyIVmhRLQ1B5LB3UmN2iAckmem58="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch new file mode 100644 index 00000000000..c959730d142 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch @@ -0,0 +1,256 @@ +diff --git a/Configure b/Configure +index e261cb9548..3bbbc4b9df 100755 +--- a/Configure ++++ b/Configure +@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1455,8 +1447,7 @@ groupstype='' + i_whoami='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1470,17 +1461,12 @@ DEBUGGING='' + archobjs='' + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1515,8 +1501,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2581,7 +2565,6 @@ uname + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -5023,7 +5006,7 @@ esac + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8860,13 +8843,8 @@ esac + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -21500,9 +21478,10 @@ $rm_try tryp + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL +index ae647d5f06..9a05d66592 100644 +--- a/ext/Errno/Errno_pm.PL ++++ b/ext/Errno/Errno_pm.PL +@@ -135,12 +135,7 @@ sub get_files { + if ($dep =~ /(\S+errno\.h)/) { + push(@file, $1); + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i && +- # might be using, say, Intel's icc +- $linux_errno_h +- ) { ++ } elsif (0) { + push(@file, $linux_errno_h); + } elsif ($^O eq 'haiku') { + # hidden in a special place +diff --git a/hints/freebsd.sh b/hints/freebsd.sh +index 4d26835e99..c6d365d84d 100644 +--- a/hints/freebsd.sh ++++ b/hints/freebsd.sh +@@ -127,21 +127,21 @@ case "$osvers" in + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff --git a/hints/linux.sh b/hints/linux.sh +index e1508c7509..5a187c583a 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -150,28 +150,6 @@ case "$optimize" in + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Ubuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-# clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then +- gcc=${cc:-cc} +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -208,32 +186,6 @@ case "$usequadmath" in + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + if ${sh:-/bin/sh} -c exit; then + echo '' + echo 'You appear to have a working bash. Good.' +@@ -311,33 +263,6 @@ sparc*) + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 3eab5e54b29..8ea1c14c711 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -96,9 +96,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "b3"; + suffix = "b4"; }; - hash = "sha256-kWDGBl6YhbN8LleGXQuyf8flSqqcGGx2HaMNK928ye4="; + hash = "sha256-8FcQw2ruWFD1wnab52uAvyEq7DUUOP34rcIMOMg2H6w="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 001e477b918..bd29d493ebb 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -62,6 +62,16 @@ in { }; } ./pip-build-hook.sh) {}; + pypaBuildHook = callPackage ({ makePythonHook, build, wheel }: + makePythonHook { + name = "pypa-build-hook.sh"; + propagatedBuildInputs = [ build wheel ]; + substitutions = { + inherit pythonInterpreter; + }; + } ./pypa-build-hook.sh) {}; + + pipInstallHook = callPackage ({ makePythonHook, pip }: makePythonHook { name = "pip-install-hook"; @@ -160,6 +170,20 @@ in { }; } ./setuptools-check-hook.sh) {}; + setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust, rust }: + makePythonHook { + name = "setuptools-rust-setup-hook"; + propagatedBuildInputs = [ setuptools-rust ]; + substitutions = { + pyLibDir = "${python}/lib/${python.libPrefix}"; + cargoBuildTarget = rust.toRustTargetSpec stdenv.hostPlatform; + cargoLinkerVar = lib.toUpper ( + builtins.replaceStrings ["-"] ["_"] ( + rust.toRustTarget stdenv.hostPlatform)); + targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + }; + } ./setuptools-rust-hook.sh) {}; + unittestCheckHook = callPackage ({ makePythonHook }: makePythonHook { name = "unittest-check-hook"; diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 745f02e8c9b..9de4c7d1dd0 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -1,13 +1,22 @@ # Setup hook to use for pip projects echo "Sourcing pip-build-hook" +declare -a pipBuildFlags + pipBuildPhase() { echo "Executing pipBuildPhase" runHook preBuild mkdir -p dist echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + @pythonInterpreter@ -m pip wheel \ + --verbose \ + --no-index \ + --no-deps \ + --no-clean \ + --no-build-isolation \ + --wheel-dir dist \ + $pipBuildFlags . echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh new file mode 100644 index 00000000000..3b713004976 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -0,0 +1,19 @@ +# Setup hook to use for pypa/build projects +echo "Sourcing pypa-build-hook" + +pypaBuildPhase() { + echo "Executing pypaBuildPhase" + runHook preBuild + + echo "Creating a wheel..." + @pythonInterpreter@ -m build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + echo "Finished creating a wheel..." + + runHook postBuild + echo "Finished executing pypaBuildPhase" +} + +if [ -z "${dontUsePypaBuild-}" ] && [ -z "${buildPhase-}" ]; then + echo "Using pypaBuildPhase" + buildPhase=pypaBuildPhase +fi diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh new file mode 100644 index 00000000000..917c19ef9b3 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh @@ -0,0 +1,18 @@ +echo "Sourcing setuptools-rust-hook" + +setuptoolsRustSetup() { + # This can work only if rustPlatform.cargoSetupHook is also included + if ! command -v cargoSetupPostPatchHook >/dev/null; then + echo "ERROR: setuptools-rust has to be used alongside with rustPlatform.cargoSetupHook!" + exit 1 + fi + + export PYO3_CROSS_LIB_DIR="@pyLibDir@" + export CARGO_BUILD_TARGET=@cargoBuildTarget@ + # TODO theoretically setting linker should not be required because it is + # already set in pkgs/build-support/rust/hooks/default.nix but build fails + # on missing linker without this. + export CARGO_TARGET_@cargoLinkerVar@_LINKER=@targetLinker@ +} + +preConfigureHooks+=(setuptoolsRustSetup) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 662ee569af7..d121f61b52d 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "11.0.0"; + version = "11.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-8JPMkmixy/8kekwdEJ8xduScEBS7+nnUIEWhVUyPecA="; + hash = "sha256-uHnHtviGieNyVQHMHsvHocJqC/n9bc6Mv0Uy6lBIuuQ="; fetchSubmodules = true; }; - cargoHash = "sha256-xojU6tS3L2e1baErdqlaG0mbDbB201ulWr66YzP6ekY="; + cargoHash = "sha256-XTpXVBsZvgY2SnTwe1dh/XYmXapu+LQ0etelO8fj7Nc="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index d5096a951a0..23c56a6706b 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -45,10 +45,11 @@ stdenv.mkDerivation rec { ninja pkg-config gi-docgen + gobject-introspection ] ++ lib.optional enableViewer wrapGAppsHook; buildInputs = - [ glib libxml2 gobject-introspection ] + [ glib libxml2 ] ++ lib.optional enableUsb libusb1 ++ lib.optionals (enableViewer || enableGstPlugin) (with gst_all_1; [ gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad ]) ++ lib.optionals (enableViewer) [ gtk3 ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f4a910b4270..d5ee431e2ba 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.4.1"; + version = "12.6.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-gSdjXSffuZb6tJXeb/nOhL2bXgTePAA3/CrG3pbc85c="; + hash = "sha256-tBAqOEeRrxbZ5fuzBvEf41ar+8oKfXynq7yaipRmECo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 8692aa3017f..2c1caf0bbb2 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -19,7 +19,8 @@ , clblas , doxygen , buildDocs ? false -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudatoolkit , darwin }: diff --git a/pkgs/development/libraries/arrow-glib/default.nix b/pkgs/development/libraries/arrow-glib/default.nix index 9c396f89d11..2e283d3c52e 100644 --- a/pkgs/development/libraries/arrow-glib/default.nix +++ b/pkgs/development/libraries/arrow-glib/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { meson ninja pkg-config + gobject-introspection ]; buildInputs = [ arrow-cpp glib - gobject-introspection ]; meta = with lib; { diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 02ed9af632f..9f5a68187c0 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I="; + sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U="; }; postPatch = '' diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index ece7ab2f692..8bece077f8c 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes +{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes, python3 , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "2.0.5"; + version = "2.2.0"; # Dependencies - buildInputs = [ curl netcdf hdf5 ]; + buildInputs = [ curl netcdf hdf5 python3 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/26823/${pname}-${version}.tar.gz"; - sha256 = "sha256-7e678cOxofDGQtrmvIx2JODFS6vkYQZNxcfaykpbDc4="; + url = "https://code.mpimet.mpg.de/attachments/download/28013/${pname}-${version}.tar.gz"; + sha256 = "sha256-Z5yNEFcGyv/LoJYOxd3EoTMsG0DFL4LDk3NWmZ2PrfI="; }; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { There are more than 600 operators available. ''; homepage = "https://code.mpimet.mpg.de/projects/cdo/"; - license = licenses.gpl2; + license = licenses.bsd3; maintainers = [ maintainers.ltavard ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/development/libraries/cereal/1.3.0.nix b/pkgs/development/libraries/cereal/1.3.0.nix new file mode 100644 index 00000000000..ab438eb6a8b --- /dev/null +++ b/pkgs/development/libraries/cereal/1.3.0.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cereal"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE="; + }; + + patches = [ + (fetchpatch { + name = "CVE-2020-11105.patch"; + url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; + hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = { + homepage = "https://uscilab.github.io/cereal/"; + description = "A header-only C++11 serialization library"; + changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/1.3.2.nix index 5a44b26426c..5a44b26426c 100644 --- a/pkgs/development/libraries/cereal/default.nix +++ b/pkgs/development/libraries/cereal/1.3.2.nix diff --git a/pkgs/development/libraries/cjose/default.nix b/pkgs/development/libraries/cjose/default.nix index 1158fa01cfb..4ecca1290e3 100644 --- a/pkgs/development/libraries/cjose/default.nix +++ b/pkgs/development/libraries/cjose/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cjose"; - version = "0.6.2.1"; + version = "0.6.2.2"; src = fetchFromGitHub { owner = "zmartzone"; repo = "cjose"; rev = "v${version}"; - sha256 = "sha256-QgSO4jFouowDJeUTT4kUEXD+ctQ7JiY/5DkiPyb+Z/I="; + sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 3fa471b30b2..3aa6024fc3d 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; - version = "9.97.0"; + version = "9.97.1"; src = fetchFromGitHub { owner = "amrayn"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; + sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 65e83437f6b..ec108adc61e 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -4,10 +4,11 @@ , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support , avx512Support ? stdenv.hostPlatform.avx512Support +, config # Enable NIVIA GPU support # Note, that this needs to be built on a system with a GPU # present for the tests to succeed. -, enableCuda ? false +, enableCuda ? config.cudaSupport # type of GPU architecture , nvidiaArch ? "sm_60" , cudatoolkit diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index ed847cb3ffe..f4a81633f54 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -28,17 +28,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.13.0"; + version = "2.13.1"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-XuI6vQR2NsJLLUPGYl3K/GZmHRrKZN7J4NBd8pWSYkw="; + sha256 = "sha256-6mfjsBmxEE0WZ6onT13DB9jL1gazmbwy3zCKd/GlZL8="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] + nativeBuildInputs = [ pkg-config which ] + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ lib.optional (!stdenv.isLinux) gnumake; @@ -60,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postInstall = glib.flattenInclude + '' + postInstall = glib.flattenInclude + # pkgsCross.mingwW64.pkg-config doesn't build + # makeWrapper doesn't cross-compile to windows #120726 + + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' substituteInPlace $dev/bin/freetype-config \ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index dbf5b9c2373..0215b82a828 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -7,7 +7,7 @@ , opencv , pcre , pkg-config -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages }: diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index fad65d7dd4c..17ef806ec9a 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail + nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython gobject-introspection ]; + buildInputs = [ atk dbus evemu frame gdk-pixbuf grail gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 4bad33000c0..c2bf28d7104 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { json-glib libsoup_3 avahi - gobject-introspection ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf ] ++ lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index a8e8fde96f6..ec929272dea 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -54,9 +54,13 @@ stdenv.mkDerivation rec { xz xz.bin ]; - buildInputs = [ bash ] - # HACK, see #10874 (and 14664) - ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ + bash + ] + ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ + # HACK, see #10874 (and 14664) + libiconv + ]; setupHooks = [ ../../../build-support/setup-hooks/role.bash diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 7be4c302049..9d8f0fd823f 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.1"; + version = "0.14.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "7D7j7DhguceJWKVdqJz3auIwWEjhL0GUW3tSEk2PbPk="; + sha256 = "Kgyc9I++izQ1AIhm/9QLjt2wZn0iErQjlv32iOk84L4="; }; nativeBuildInputs = [ @@ -54,11 +54,6 @@ stdenv.mkDerivation rec { "-Dtests=true" ]; - # Needed for darwin due to std::auto_ptr in exiv2 header files & enabling C++ 17 - # https://github.com/Exiv2/exiv2/issues/2359 - # https://gitlab.gnome.org/GNOME/gexiv2/-/issues/73 - env.NIX_CFLAGS_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"; - doCheck = true; preCheck = let diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 5202dc0edab..8c8a587ed54 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,8 +1,15 @@ -{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, fixDarwinDylibNames +, pkgsStatic +}: stdenv.mkDerivation rec { pname = "giflib"; version = "5.2.1"; + src = fetchurl { url = "mirror://sourceforge/giflib/giflib-${version}.tar.gz"; sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; @@ -14,33 +21,48 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/giflib/raw/2e9917bf13df114354163f0c0211eccc00943596/f/CVE-2022-28506.patch"; sha256 = "sha256-TBemEXkuox8FdS9RvjnWcTWPaHRo4crcwSR9czrUwBY="; }) - ] ++ lib.optional stdenv.hostPlatform.isDarwin + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # https://sourceforge.net/p/giflib/bugs/133/ (fetchpatch { - # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; url = "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"; sha256 = "12afkqnlkl3n1hywwgx8sqnhp3bz0c5qrwcv8j9hifw1lmfhv67r"; extraPrefix = "./"; - }); - - postPatch = '' - substituteInPlace Makefile \ - --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' - '' - # Upstream build system does not support NOT building shared libraries. - + lib.optionalString stdenv.hostPlatform.isStatic '' + }) + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + # Build dll libraries. + (fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=4cf1e519bcf51338dc607d23388fca47d71790c0"; + sha256 = "KyJi3eqH/Ae+guEK6znraZI5+IPImaoYoW5NTkCvjsg="; + }) + + # Install executables. + ./mingw-install-exes.patch + ]; + + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + + makeFlags = [ + "PREFIX=${builtins.placeholder "out"}" + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + # Upstream build system does not support NOT building shared libraries. sed -i '/all:/ s/libgif.so//' Makefile sed -i '/all:/ s/libutil.so//' Makefile sed -i '/-m 755 libgif.so/ d' Makefile sed -i '/ln -sf libgif.so/ d' Makefile ''; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - - passthru.tests.static = pkgsStatic.giflib; + passthru.tests = { + static = pkgsStatic.giflib; + }; meta = { description = "A library for reading and writing gif images"; + homepage = "https://giflib.sourceforge.net/"; platforms = lib.platforms.unix; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/giflib/mingw-install-exes.patch b/pkgs/development/libraries/giflib/mingw-install-exes.patch new file mode 100644 index 00000000000..5ec3fdad7e6 --- /dev/null +++ b/pkgs/development/libraries/giflib/mingw-install-exes.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -92,7 +92,7 @@ + install: all install-bin install-include install-lib install-man + install-bin: $(INSTALLABLE) + $(INSTALL) -d "$(DESTDIR)$(BINDIR)" +- $(INSTALL) $^ "$(DESTDIR)$(BINDIR)" ++ $(INSTALL) $(^:=.exe) "$(DESTDIR)$(BINDIR)" + install-include: + $(INSTALL) -d "$(DESTDIR)$(INCDIR)" + $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b2e6e48c026..276f2d192ef 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection gst-plugins-base orc json-glib diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 8ce2caa4426..449873bc7c5 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gobject-introspection graphene orc libtheora diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 1a52a8ed42b..ed7396f291c 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash-completion - gobject-introspection ] ++ lib.optionals stdenv.isLinux [ libcap libunwind diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 6fcf867f05e..5b1396f35d5 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { cairo python3 json-glib - gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index a5926a776e3..a8bbb632055 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { buildInputs = [ bash-completion libxml2 - gobject-introspection gst-devtools python3 ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index dae91bda37d..2420b051573 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -45,7 +45,9 @@ , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); +# MMAL is not supported on aarch64, see: +# https://github.com/raspberrypi/userland/issues/688 +assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -156,9 +158,11 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # TODO check if we can keep this enabled "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only - ] ++ lib.optionals (!raspiCameraSupport) [ + ] ++ (if raspiCameraSupport then [ + "-Drpi-lib-dir=${libraspberrypi}/lib" + ] else [ "-Drpicamsrc=disabled" - ]; + ]); postPatch = '' patchShebangs \ diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 4344a0f124c..885726ee2ac 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gst-plugins-bad - gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/development/libraries/hfst-ospell/default.nix new file mode 100644 index 00000000000..ad07025cc35 --- /dev/null +++ b/pkgs/development/libraries/hfst-ospell/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, icu +, libarchive +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hfst-ospell"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "hfst"; + repo = "hfst-ospell"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; + }; + + buildInputs = [ + icu + libarchive + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + # libxmlxx is listed as a dependency but Darwin build fails with it, + # might also be better in general since libxmlxx in Nixpkgs is 8 years old + # https://github.com/hfst/hfst-ospell/issues/48#issuecomment-546535653 + configureFlags = [ + "--without-libxmlpp" + "--without-tinyxml2" + ]; + + meta = with lib; { + homepage = "https://github.com/hfst/hfst-ospell/"; + description = "HFST spell checker library and command line tool "; + license = licenses.asl20; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix new file mode 100644 index 00000000000..41707bbd498 --- /dev/null +++ b/pkgs/development/libraries/hfst/default.nix @@ -0,0 +1,53 @@ +{ lib +, autoreconfHook +, bison +, flex +, foma +, fetchFromGitHub +, gettext +, icu +, stdenv +, swig +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hfst"; + version = "3.16.0"; + + src = fetchFromGitHub { + owner = "hfst"; + repo = "hfst"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU="; + }; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + swig + ]; + + buildInputs = [ + foma + gettext + icu + zlib + ]; + + configureFlags = [ + "--enable-all-tools" + "--with-foma-upstream=true" + ]; + + meta = with lib; { + description = "FST language processing library"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/hipfort/default.nix b/pkgs/development/libraries/hipfort/default.nix index e22d09fbee8..5c5f0f61e81 100644 --- a/pkgs/development/libraries/hipfort/default.nix +++ b/pkgs/development/libraries/hipfort/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "5.4.3"; + version = "5.6.0"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-cXzNOvWIU388AU5hzLwmIGaX5DvzIJJCvgkP2BA4jao="; + hash = "sha256-x1pF9md7RIcobE/4UxHxOaURbljFZGOashW1KM0lmo0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/development/libraries/hnswlib/default.nix new file mode 100644 index 00000000000..c3a543972e0 --- /dev/null +++ b/pkgs/development/libraries/hnswlib/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +}: +let + python = python3.withPackages(ps: with ps; [ + numpy + ]); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "hnswlib"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "nmslib"; + repo = "hnswlib"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-XXz0NIQ5dCGwcX2HtbK5NFTalP0TjLO6ll6TmH3oflI="; + }; + + # this is a header-only library, so we don't need to build it + # we need `cmake` only to run tests + nativeBuildInputs = lib.optionals finalAttrs.doCheck [ + cmake + python + ]; + + # we only want to run buildPhase when we run tests + dontBuild = !finalAttrs.doCheck; + + installPhase = '' + runHook preInstall + + install -Dm644 $src/hnswlib/*.h -t $out/include/hnswlib + + runHook postInstall + ''; + + doCheck = true; + + preCheck = '' + pushd ../tests/cpp + ${python.interpreter} update_gen_data.py + popd + ''; + + checkPhase = '' + runHook preCheck + + ./test_updates + + runHook postCheck + ''; + + meta = with lib; { + description = "Header-only C++/python library for fast approximate nearest neighbors"; + homepage = "https://github.com/nmslib/hnswlib"; + changelog = "https://github.com/nmslib/hnswlib/releases/tag/${finalAttrs.src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index fbef44bf67e..b0c632b69c0 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -2,7 +2,8 @@ , x11Support ? false , libX11 , cairo -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudaPackages }: diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 4ed72f4acd1..cb014ed80bf 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { patches = [ # fix platform detection (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/04ffb03f744780a55aba311c612d708b00584bb7/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + sha256 = "sha256-o/Pg0S53SYh3O7L+AwxOPl1Bx4TS6iKB8ql8GhhHI/o="; }) ]; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 41e9a2d0a03..59572afc627 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -40,19 +40,13 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" + "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}" ] # the test's won't compile if secureMemory is used because there is no # comparison operators and conversion functions between # std::basic_string<..., Json::SecureAllocator<char>> vs. # std::basic_string<..., [default allocator]> - ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF" - ++ lib.optional (!enableStatic) "-DBUILD_STATIC_LIBS=OFF"; - - # this is fixed and no longer necessary in 1.9.5 but there they use - # memset_s without switching to a different c++ standard in the cmake files - postInstall = lib.optionalString enableStatic '' - (cd $out/lib && ln -sf libjsoncpp_static.a libjsoncpp.a) - ''; + ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF"; meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index e4318ebe619..2efbf85d47c 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU="; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ]; buildInputs = [ libtool gnome.gnome-common gtk-doc gtk2 - lua gobject-introspection + lua ]; configureFlags = [ "--disable-python" ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 70bd3d384de..e3f91c3d827 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config python3 + gobject-introspection ]; buildInputs = [ glib - gobject-introspection gtk-doc libtool libxml2 diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index bd5edec68a0..782d86f1f58 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = lib.optional (!sslSupport) "--disable-openssl"; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 371708d81fa..412e8b528c9 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-bQtfye+gn7GOyzCtji4st5hsV40rPzuaYDP7N1tZ8wg="; + hash = "sha256-Gym2iHq5ws9kuG4HWSQndD8hVugV4USZt6dUFnEkLwY="; }; nativeBuildInputs = [ cmake ninja ]; @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { "-DGTEST_MAIN_LIBRARY=${lib.getLib gtest}/lib/libgtest_main${libExt}" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ "-DHWY_CMAKE_ARM7=ON" + ] ++ lib.optionals stdenv.hostPlatform.isx86_32 [ + # Quoting CMakelists.txt: + # This must be set on 32-bit x86 with GCC < 13.1, otherwise math_test will be + # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. + # Fixes tests: + # HwyMathTestGroup/HwyMathTest.TestAllAtanh/EMU128 + # HwyMathTestGroup/HwyMathTest.TestAllLog1p/EMU128 + "-DHWY_CMAKE_SSE2=ON" ]; # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index 2cef20fdcbd..9b3de39e5d9 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "sha256-W7Hvc2zkmR6FdPGsymWXtm66BiHLcW9r7mywHjabeLc="; + sha256 = "sha256-RuahOkDLbac9bhXn8QSf7lMRw11PIpXQo3eaQ9N4Rtc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 5ba2ecc5d6b..efd914ca7b1 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { (stdenv.hostPlatform.libc == "glibc") "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; - buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; + buildInputs = [ gettext glib libxml2 gnome-common ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ]; meta = with lib; { description = "An interface library to access tags for identifying languages"; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 6cff9e3f03a..23cb0061805 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config automake autoconf intltool ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ]; buildInputs = [ libtool - gobject-introspection glib gtk2 gtk-doc clutter clutter-gtk ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 281aff548c8..8618986195e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation (rec { - version = "4.12.0"; + version = "4.13.0"; pname = "libpfm"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; - sha256 = "sha256-SwwfU/OaYVJbab6/UyxoBAwbmE11RKiuCESxPNkeHuQ="; + sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; makeFlags = [ diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index cfe7fb89bd5..aec9cfaaf91 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -13,7 +13,7 @@ , glfw , libGLU , curl -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , enablePython ? false, pythonPackages ? null , enableGUI ? false, }: diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 086ca28676b..780ae7418dd 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; + buildInputs = [ dbus dbus-glib gtk3 gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = "https://wiki.gnome.org/Attic/LibUnique"; diff --git a/pkgs/development/libraries/libvoikko/default.nix b/pkgs/development/libraries/libvoikko/default.nix new file mode 100644 index 00000000000..3f5f4ef5c85 --- /dev/null +++ b/pkgs/development/libraries/libvoikko/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, autoreconfHook +, hfst-ospell +, fetchFromGitHub +, pkg-config +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libvoikko"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "voikko"; + repo = "corevoikko"; + rev = "refs/tags/rel-libvoikko-${finalAttrs.version}"; + hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M="; + }; + + sourceRoot = "${finalAttrs.src.name}/libvoikko"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + hfst-ospell + ]; + + meta = with lib; { + homepage = "https://voikko.puimula.org/"; + description = "Finnish language processing library"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 6ba8eaf6f17..3b71167cdec 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.9.2"; + version = "1.10.0"; src = fetchurl { url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; + sha256 = "sha256-UqYLRhglh+CDtx4rgvyqumTdXrAcWx8bxxBpo4WOQP4="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index 7ac716b326d..25cb21a314c 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true -, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false +, cudaSupport ? config.cudaSupport, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false , rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }: assert doCheck -> mpiSupport != true; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1cd14cbcb56..19b03a24a45 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -21,7 +21,7 @@ , sox , vid-stab , darwin -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? { } , enableJackrack ? stdenv.isLinux , ladspa-sdk diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index a8dd555cb9b..9507d3fce6d 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "movit"; - version = "1.6.3"; + version = "1.7.0"; src = fetchurl { url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; - sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; + sha256 = "sha256-I1l7k+pTdi1E33Y+zCtwIwj3b8Fzggmek4UiAIHOZhA="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mqtt_cpp/default.nix b/pkgs/development/libraries/mqtt_cpp/default.nix new file mode 100644 index 00000000000..fca89f8d0f6 --- /dev/null +++ b/pkgs/development/libraries/mqtt_cpp/default.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mqtt_cpp"; + version = "13.2.1"; + + src = fetchFromGitHub { + owner = "redboltz"; + repo = "mqtt_cpp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-E5dMZ0uJ1AOwiGTxD4qhbO72blplmXHh1gTYGE34H+0="; + }; + + nativeBuildInputs = [cmake]; + + buildInputs = [boost]; + + meta = with lib; { + description = "MQTT client/server for C++14 based on Boost.Asio"; + homepage = "https://github.com/redboltz/mqtt_cpp"; + license = licenses.boost; + maintainers = with maintainers; [spalf]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 2fae8135124..e26fe4fa003 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,11 +7,11 @@ # Optional dependencies , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , c-aresMinimal, libev, openssl, zlib -, enableAsioLib ? false, boost , enableGetAssets ? false, libxml2 , enableHpack ? false, jansson +, enableHttp3 ? false, ngtcp2, nghttp3, quictls , enableJemalloc ? false, jemalloc -, enablePython ? false, python3Packages, ncurses +, enablePython ? false, python3, ncurses # Unit tests ; we have to set TZDIR, which is a GNUism. , enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata @@ -27,41 +27,38 @@ assert enableGetAssets -> enableApp; assert enableHpack -> enableApp; +assert enableHttp3 -> enableApp; assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.51.0"; + version = "1.54.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6z6m9bYMbT7b8GXgT0NOjtYpGlyxoHkZxBcwqx/MAOA="; + sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0="; }; - outputs = [ "bin" "out" "dev" "lib" ] - ++ lib.optionals (enablePython) [ "python" ]; + outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (enableApp) [ installShellFiles ] - ++ lib.optionals (enablePython) [ python3Packages.cython ]; + ++ lib.optionals (enableApp) [ installShellFiles ]; - buildInputs = lib.optionals enableApp [ c-aresMinimal libev openssl zlib ] - ++ lib.optionals (enableAsioLib) [ boost ] + buildInputs = lib.optionals enableApp [ c-aresMinimal libev zlib ] + ++ lib.optionals (enableApp && !enableHttp3) [ openssl ] ++ lib.optionals (enableGetAssets) [ libxml2 ] ++ lib.optionals (enableHpack) [ jansson ] ++ lib.optionals (enableJemalloc) [ jemalloc ] - ++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ]; + ++ lib.optionals (enableHttp3) [ ngtcp2 nghttp3 quictls ] + ++ lib.optionals (enablePython) [ python3 ]; enableParallelBuilding = true; configureFlags = [ "--disable-examples" (lib.enableFeature enableApp "app") - ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] - ++ lib.optionals (enablePython) [ - "--enable-python-bindings" - "--with-cython=${python3Packages.cython}/bin/cython" - ]; + (lib.enableFeature enableHttp3 "http3") + ]; # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; @@ -70,22 +67,18 @@ stdenv.mkDerivation rec { export TZDIR=${tzdata}/share/zoneinfo ''; - preInstall = lib.optionalString (enablePython) '' - mkdir -p $out/${python3Packages.python.sitePackages} - # convince installer it's ok to install here - export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}" - ''; - postInstall = lib.optionalString (enablePython) '' - mkdir -p $python/${python3Packages.python.sitePackages} - mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages} - rm -r $out/lib - '' + lib.optionalString (enableApp) '' + postInstall = lib.optionalString (enableApp) '' installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} + '' + lib.optionalString (!enableApp) '' + rm -r $out/bin + '' + lib.optionalString (enablePython) '' + patchShebangs $out/share/nghttp2 + '' + lib.optionalString (!enablePython) '' + rm -r $out/share ''; passthru.tests = { inherit curl libsoup; - python-nghttp2 = python3Packages.nghttp2; }; meta = with lib; { diff --git a/pkgs/development/libraries/nvidia-thrust/default.nix b/pkgs/development/libraries/nvidia-thrust/default.nix index 679b2c61c45..f68b57f193b 100644 --- a/pkgs/development/libraries/nvidia-thrust/default.nix +++ b/pkgs/development/libraries/nvidia-thrust/default.nix @@ -8,7 +8,7 @@ , symlinkJoin , tbb , hostSystem ? "CPP" -, deviceSystem ? if config.cudaSupport or false then "CUDA" else "OMP" +, deviceSystem ? if config.cudaSupport then "CUDA" else "OMP" }: # Policy for device_vector<T> diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix new file mode 100644 index 00000000000..d6d0f1741d1 --- /dev/null +++ b/pkgs/development/libraries/omorfi/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, autoreconfHook +, cg3 +, fetchFromGitHub +, hfst +, hfst-ospell +, icu +, libvoikko +, makeWrapper +, pkg-config +, python3 +, zip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "omorfi"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "flammie"; + repo = "omorfi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; + }; + + # Fix for omorfi-hyphenate.sh file not found error + postInstall = '' + ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} + ''; + + nativeBuildInputs = [ + autoreconfHook + cg3 + makeWrapper + pkg-config + python3 + zip + python3.pkgs.wrapPython + ]; + + buildInputs = [ + python3.pkgs.hfst + hfst-ospell + libvoikko + ]; + + # Supplied pkg-config file doesn't properly expose these + propagatedBuildInputs = [ + hfst + icu + ]; + + # Wrap shell scripts so they find the Python scripts + # omorfi.bash inexplicably fails when wrapped + preFixup = '' + wrapPythonProgramsIn "$out/bin" "$out ${python3.pkgs.hfst}" + for i in "$out/bin"/*.{sh,bash}; do + if [ $(basename "$i") != "omorfi.bash" ]; then + wrapProgram "$i" --prefix "PATH" : "$out/bin/" + fi + done + ''; + + # Enable all features + configureFlags = [ + "--enable-labeled-segments" + "--enable-lemmatiser" + "--enable-segmenter" + "--enable-hyphenator" + ]; + + meta = with lib; { + description = "Analysis for Finnish text"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Darwin build fails due to hfst not being found + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 40614f489b5..0188e5e1ae9 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && +, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 , cudaPackages ? { } , enableUnfree ? false diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3f120e2558f..c82f0a0065b 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -37,7 +37,7 @@ , blas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index 243d8830565..e027650c473 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "sha256-Kl+aOA797aZvrvW4ZQNHdSU7YFPieZEzX3aYeaoH6eU="; + sha256 = "sha256-cYf6ehAaz9EUOYyfR7aS3tXALgWtF48m9bqXHcJsAiU="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index eded5f1b5b9..11121059500 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -96,6 +96,9 @@ stdenv.mkDerivation rec { preCheck = '' substituteInPlace tests/scripts/all \ --replace "/bin/rm" "rm" + + # skip flaky tests + rm -f tests/scripts/test063-delta-multiprovider ''; doCheck = true; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index e9a0fece56f..937669fc585 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx - +, config # Enable CUDA support -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport, cudatoolkit # Enable the Sun Grid Engine bindings , enableSGE ? false diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 9511f4f56f7..4cd398e6394 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudaSupport ? config.cudaSupport, cudatoolkit # For visibility mostly. The whole approach to cuda architectures and capabilities # will be reworked soon. , cudaArch ? "compute_37" diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 79bc2421dc9..9fa4bf10f47 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ - cairo glib gobject-introspection + cairo glib gnome.gnome-common gtk3 gnome.libsoup ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 584fc7d5ecc..aa226674d76 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.75"; + version = "0.3.76"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-2irYbRmJi/+6Ap0G8dfC/pwh0Ql19srMVsw8CnfTsDY="; + sha256 = "sha256-3nD5etLohEIM4/5RDxaBzNxSngY817R6AzT2fqwjMiU="; }; patches = [ diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 37d83ff5b2b..fdccb4d0933 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, fetchpatch2 +}: stdenv.mkDerivation rec { pname = "popt"; @@ -12,6 +16,23 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + # Do not require <sys/ioctl.h> + (fetchpatch2 { + url = "https://aur.archlinux.org/cgit/aur.git/plain/get-w32-console-maxcols.mingw32.patch?h=mingw-w64-popt&id=63f2cdb0de116362c49681cef20f7a8b4355e85a"; + sha256 = "zv43l1RBqNzT/JG+jQaMVFaFv+ZYPuIiAtKUDzJJBbc="; + stripLen = 1; + extraPrefix = "src/"; + }) + + # Do not try to detect setuid, it is not a thing. + (fetchpatch2 { + url = "https://github.com/rpm-software-management/popt/commit/905544c5d9767894edaf71a1e3ce5126944c5695.patch"; + sha256 = "3PmcxeiEZ/Hof0zoVFSytEXvQ8gE8Sp5UdagExPVICU="; + stripLen = 1; + extraPrefix = "src/"; + revert = true; + }) ]; doCheck = false; # fails diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index b1b78bb2570..838657f48bb 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.4.0"; + version = "11.5.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-cG8TxgWXZGol7X2eRQNeknMo4L8PoWSMvxOsDVO/Rx4="; + hash = "sha256-lojvsCgBsT7wVRLWfkeOduEYUG7ztI/uryM0WueWiL0="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 2333b63057e..ec9669f3c7d 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "1.11.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-Qqdw5dy+JUBSDpbWEh3Ap3+3h+CcNdfBL+rloRzWGEQ="; + hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 8a6b72f5213..87aa5a701c3 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchurl, bzip2, zlib }: +{ stdenv +, lib +, fetchurl +, bzip2 +, zlib +}: stdenv.mkDerivation rec { pname = "cfitsio"; @@ -9,31 +14,41 @@ stdenv.mkDerivation rec { sha256 = "sha256-66U9Gz9uNFYyuwmnt1LsfO09Y+xRU6hIOA84gMXWGIk="; }; - buildInputs = [ bzip2 zlib ]; + patches = [ + ./darwin-rpath-universal.patch + ]; - patches = [ ./darwin-rpath-universal.patch ]; + buildInputs = [ + bzip2 + zlib + ]; - configureFlags = [ "--with-bzip2=${bzip2.out}" "--enable-reentrant" ]; + configureFlags = [ + "--with-bzip2=${bzip2.out}" + "--enable-reentrant" + ]; hardeningDisable = [ "format" ]; # Shared-only build buildFlags = [ "shared" ]; - postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in - ''; + + postPatch = '' + sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + ''; meta = with lib; { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; - longDescription = - '' CFITSIO is a library of C and Fortran subroutines for reading and - writing data files in FITS (Flexible Image Transport System) data - format. CFITSIO provides simple high-level routines for reading and - writing FITS files that insulate the programmer from the internal - complexities of the FITS format. CFITSIO also provides many - advanced features for manipulating and filtering the information in - FITS files. - ''; + longDescription = '' + CFITSIO is a library of C and Fortran subroutines for reading and + writing data files in FITS (Flexible Image Transport System) data + format. CFITSIO provides simple high-level routines for reading and + writing FITS files that insulate the programmer from the internal + complexities of the FITS format. CFITSIO also provides many + advanced features for manipulating and filtering the information in + FITS files. + ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = licenses.mit; maintainers = with maintainers; [ xbreak hjones2199 ]; diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 2ad84249758..a7c388339de 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -11,7 +11,8 @@ , enableOpencl ? true , opencl-headers , ocl-icd -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudaPackages , addOpenGLRunpath }: diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index cdfa924b224..e0a6ffd9d54 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,6 +94,7 @@ in # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so ''; passthru = { diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index d67f31375e7..21e6cbf858c 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -5,7 +5,7 @@ , stdenv , cmake , cudaPackages ? { } -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , nvidia-thrust , useThrustSourceBuild ? true , pythonSupport ? true diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index d10da6843c3..04f263568ce 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -86,29 +86,6 @@ let # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 "${minArch'}0"; - cuda-common-redist = with cudaPackages; [ - libcublas # cublas_v2.h - libcusparse # cusparse.h - ]; - - # Build-time dependencies - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # <cuda_profiler_api.h> - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # <cuda_profiler_api.h> - ] ++ cuda-common-redist; - }; - - # Run-time dependencies - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; @@ -128,16 +105,22 @@ stdenv.mkDerivation { ninja gfortran ] ++ lists.optionals cudaSupport [ - cuda-native-redist + cudaPackages.cuda_nvcc ]; buildInputs = [ libpthreadstubs lapack blas - ] ++ lists.optionals cudaSupport [ - cuda-redist - ] ++ lists.optionals rocmSupport [ + ] ++ lists.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + libcublas # cublas_v2.h + libcusparse # cusparse.h + ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + cuda_nvprof # <cuda_profiler_api.h> + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + cuda_profiler_api # <cuda_profiler_api.h> + ]) ++ lists.optionals rocmSupport [ hip hipblas hipsparse diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 95eeaeb8abf..cbc24b15465 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, gfortran, blas, lapack -, enableCuda ? false, cudatoolkit +, config +, enableCuda ? config.cudaSupport, cudatoolkit }: let diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 51b55592d42..67dfef186e7 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -6,7 +6,8 @@ , fixDarwinDylibNames , gmp , mpfr -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit }: diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index cde327c550e..3c31d152fc7 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-UUWJENGn60YQdUSQ55uL+/3xt/JUsVuKnqm/ef7wPVM="; + hash = "sha256-Iy9BhkyJa2nFxwVXb4LAlgVAHnu+58Ago2eEgAIlZ7M="; }; patches = [ diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/1.2.nix index cdb2b519329..cdb2b519329 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/1.2.nix diff --git a/pkgs/development/libraries/tclap/1.4.nix b/pkgs/development/libraries/tclap/1.4.nix new file mode 100644 index 00000000000..7a0b5765963 --- /dev/null +++ b/pkgs/development/libraries/tclap/1.4.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchgit +, cmake +, doxygen +, python3 +}: +stdenv.mkDerivation { + pname = "tclap"; + + # This version is slightly newer than 1.4.0-rc1: + # See https://github.com/mirror/tclap/compare/1.4.0-rc1..3feeb7b2499b37d9cb80890cadaf7c905a9a50c6 + version = "1.4-3feeb7b"; + + src = fetchgit { + url = "git://git.code.sf.net/p/tclap/code"; + rev = "3feeb7b2499b37d9cb80890cadaf7c905a9a50c6"; # 1.4 branch + hash = "sha256-byLianB6Vf+I9ABMmsmuoGU2o5RO9c5sMckWW0F+GDM="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + nativeBuildInputs = [ + cmake + doxygen + python3 + ]; + + # Installing docs is broken in this package+version so we stub out some files + preInstall = '' + touch docs/manual.html + ''; + + doCheck = true; + + meta = with lib; { + description = "Templatized C++ Command Line Parser Library (v1.4)"; + homepage = "https://tclap.sourceforge.net/"; + license = licenses.mit; + maintainers = teams.deshaw.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix index 56cebc08dcc..e26e6e603f8 100644 --- a/pkgs/development/libraries/ucc/default.nix +++ b/pkgs/development/libraries/ucc/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit , enableAvx ? stdenv.hostPlatform.avxSupport , enableSse41 ? stdenv.hostPlatform.sse4_1Support diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 1af9a7ce7cb..4ded9c2860a 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl , rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit , enableRocm ? false , rocm-core, rocm-runtime, rocm-device-libs, hip diff --git a/pkgs/development/libraries/xeus-zmq/default.nix b/pkgs/development/libraries/xeus-zmq/default.nix new file mode 100644 index 00000000000..bde2dfefee7 --- /dev/null +++ b/pkgs/development/libraries/xeus-zmq/default.nix @@ -0,0 +1,45 @@ +{ lib +, clangStdenv +, fetchFromGitHub +, cmake +, cppzmq +, libuuid +, nlohmann_json +, openssl +, xeus +, xtl +, zeromq +}: + +clangStdenv.mkDerivation rec { + pname = "xeus-zmq"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus-zmq"; + rev = "${version}"; + hash = "sha256-j23NPgqwjQ7x4QriCb+N7CtBWhph+pCmBC0AULEDL1U="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cppzmq + libuuid + openssl + xeus + xtl + zeromq + ]; + + propagatedBuildInputs = [ nlohmann_json ]; + + meta = { + description = "ZeroMQ-based middleware for xeus"; + homepage = "https://github.com/jupyter-xeus/xeus-zmq"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 0a404f616b9..31d064c2af6 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -5,7 +5,7 @@ , cmake , gtest , doCheck ? true -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , ncclSupport ? false , rLibrary ? false , cudaPackages diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index ec2d166ef58..cfaf2182686 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_TESTS=ON" ]; + cmakeFlags = [ + "-DBUILD_TESTS=${if (doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + ]; doCheck = true; nativeCheckInputs = [ gtest ]; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index d5a8df6f437..f7631de1bf2 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,39 +2,19 @@ , stdenv , fetchFromGitHub , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA="; + hash = "sha256-kofPs01jb189LUjYHHt+KxDifZQWl0Hm779711mvWtI="; }; - # CMake build fixes - patches = [ - # Merged in https://github.com/Cyan4973/xxHash/pull/649 - # Should be present in next release - (fetchpatch { - name = "cmake-install-fix"; - url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch"; - sha256 = "sha256-B1PZ/0BXlOrSiPvgCPLvI/sjQvnR0n5PQHOO38LOij0="; - }) - - # Submitted at https://github.com/Cyan4973/xxHash/pull/723 - (fetchpatch { - name = "cmake-pkgconfig-fix"; - url = "https://github.com/Cyan4973/xxHash/commit/5db353bbd05ee5eb1f90afc08d10da9416154e55.patch"; - sha256 = "sha256-dElgSu9DVo2hY6TTVHLTtt0zkXmQV3nc9i/KbrDkK8s="; - }) - ]; - - nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 950a7e0dc59..61f57f07626 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -296,12 +296,12 @@ let nclasses = build-asdf-system { pname = "nclasses"; - version = "0.5.0"; + version = "0.6.0"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nclasses"; - rev = "0.5.0"; - sha256 = "sha256-UcavZ0fCA2hkVU/CqUZfyCqJ8gXKPpXTCP0WLUIF1Ss="; + rev = "0.6.0"; + sha256 = "sha256-JupP+TIxavUoyOPnp57FqpEjWfgKspdFoSRnV2rk5U4="; }; lispLibs = [ self.nasdf super.moptilities ]; }; @@ -330,10 +330,12 @@ let nhooks = build-asdf-system { pname = "nhooks"; - version = "20230214-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nhooks-20230214-git.tgz"; - sha256 = "0rapn9v942yd2snlskvlr1g22hmyhlsrclahxjsgn4pbvqc5gwyw"; + version = "1.2.1"; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "nhooks"; + rev = "1.2.1"; + hash = "sha256-D61QHxHTceIu5mCGKf3hy53niQMfs0idEYQK1ZYn1YM="; }; lispLibs = with self; [ bordeaux-threads closer-mop serapeum ]; }; @@ -368,7 +370,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.4.0"; + version = "3.5.0"; lispLibs = (with super; [ alexandria @@ -437,8 +439,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.4.0"; - sha256 = "sha256-o+GAMHKi+9q+EGY6SEZrxKCEO4IxdOiB4oPpJPGYO0w="; + rev = "3.5.0"; + sha256 = "sha256-/x3S4qAvvHxUxDcs6MAuZvAtqLTQdwlH7r4zFlKIjY4="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -451,15 +453,17 @@ let pkgs.gnome.adwaita-icon-theme ]; - # This is needed since asdf:make tries to write in the directory of the .asd file of the system it's compiling - postConfigure = '' - export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)// - ''; + # This patch removes the :build-operation component from the nyxt/gi-gtk-application system. + # This is done because if asdf:operate is used and the operation matches the system's :build-operation + # then output translations are ignored, causing the result of the operation to be placed where + # the .asd is located, which in this case is the nix store. + # see: https://gitlab.common-lisp.net/asdf/asdf/-/blob/master/doc/asdf.texinfo#L2582 + patches = [ ./patches/nyxt-remove-build-operation.patch ]; buildScript = pkgs.writeText "build-nyxt.lisp" '' (load "${super.alexandria.asdfFasl}/asdf.${super.alexandria.faslExt}") - ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:make instead - (asdf:make :nyxt/gi-gtk-application) + ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:operare :program-op instead + (asdf:operate :program-op :nyxt/gi-gtk-application) ''; # TODO(kasper): use wrapGAppsHook diff --git a/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch b/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch new file mode 100644 index 00000000000..e050ce10b48 --- /dev/null +++ b/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch @@ -0,0 +1,12 @@ +diff --git a/nyxt.asd b/nyxt.asd +index ea2630ce..fdf837e4 100644 +--- a/nyxt.asd ++++ b/nyxt.asd +@@ -480,7 +480,6 @@ The renderer is configured from NYXT_RENDERER or `*nyxt-renderer*'.")) + :defsystem-depends-on ("nasdf") + :class :nasdf-system + :depends-on (nyxt/gi-gtk) +- :build-operation "program-op" + :build-pathname "nyxt" + :entry-point "nyxt:entry-point") + diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e999c18b3e7..7395090060c 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,9 +39,11 @@ in mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 + "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 eslint_d = pkgs.eslint_d; # Added 2023-05-26 manta = pkgs.node-manta; # Added 2023-05-06 readability-cli = pkgs.readability-cli; # Added 2023-06-12 diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 937a482e015..196e4bad11f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -84332,426 +84332,6 @@ in bypassCache = true; reconstructLock = true; }; - "@bitwarden/cli" = nodeEnv.buildNodePackage { - name = "_at_bitwarden_slash_cli"; - packageName = "@bitwarden/cli"; - version = "2023.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2023.7.0.tgz"; - sha512 = "xFurknMuDhsHFcwhewZxES1rP6bWOUqI4CfHlHI+vY//vOqUGzpz3Wo/H77ki1ufpNQLq4NEFJBZsuEwF8PRgA=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.9" - sources."@babel/generator-7.22.9" - sources."@babel/helper-compilation-targets-7.22.9" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.9" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helpers-7.22.6" - (sources."@babel/highlight-7.22.5" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."@babel/parser-7.22.7" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.8" - sources."@babel/types-7.22.5" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - (sources."@jridgewell/trace-mapping-0.3.18" // { - dependencies = [ - sources."@jridgewell/sourcemap-codec-1.4.14" - ]; - }) - (sources."@koa/multer-3.0.2" // { - dependencies = [ - sources."multer-1.4.4" - ]; - }) - sources."@koa/router-12.0.0" - (sources."@mapbox/node-pre-gyp-1.0.11" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" - ]; - }) - sources."@phc/format-1.0.0" - sources."@tootallnate/once-2.0.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."accepts-1.3.8" - sources."agent-base-6.0.2" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."append-field-1.0.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."argon2-0.30.3" - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."big-integer-1.6.51" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."browser-hrtime-1.1.8" - sources."browserslist-4.21.9" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."busboy-0.2.14" - sources."bytes-3.1.2" - sources."cache-content-type-1.0.1" - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001517" - sources."canvas-2.11.2" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."co-4.6.0" - sources."co-body-6.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-7.2.0" - sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - sources."console-control-strings-1.1.0" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" - sources."cookies-0.8.0" - sources."copy-to-2.0.1" - sources."core-util-is-1.0.3" - sources."cssstyle-3.0.0" - sources."data-urls-4.0.0" - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."deep-equal-1.0.1" - sources."defaults-1.0.4" - sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-libc-2.0.2" - sources."dicer-0.2.5" - sources."domexception-4.0.0" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.466" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."entities-4.5.0" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."external-editor-3.1.0" - sources."figures-3.2.0" - sources."fix-esm-1.0.1" - sources."form-data-4.0.0" - sources."fresh-0.5.2" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gauge-3.0.2" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" - sources."glob-7.2.3" - sources."globals-11.12.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-3.0.0" - (sources."http-assert-1.5.0" // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.8.1" - sources."statuses-1.5.0" - ]; - }) - sources."http-errors-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."immediate-3.0.6" - sources."inflation-2.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."inquirer-8.2.5" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-interactive-1.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."is-promise-2.2.2" - sources."is-unicode-supported-0.1.0" - sources."is-wsl-2.2.0" - sources."isarray-0.0.1" - sources."js-tokens-4.0.0" - sources."jsdom-22.1.0" - sources."jsesc-2.5.2" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.3" - (sources."jszip-3.10.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - sources."keygrip-1.1.0" - (sources."koa-2.14.2" // { - dependencies = [ - (sources."http-errors-1.8.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) - sources."statuses-1.5.0" - ]; - }) - sources."koa-bodyparser-4.4.0" - sources."koa-compose-4.2.0" - sources."koa-convert-2.0.0" - sources."koa-is-json-1.0.0" - sources."koa-json-2.0.2" - sources."lie-3.3.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lowdb-1.0.0" - sources."lru-cache-5.1.1" - sources."lunr-2.3.9" - sources."make-dir-3.1.0" - sources."media-typer-0.3.0" - sources."methods-1.1.2" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - (sources."multer-1.4.5-lts.1" // { - dependencies = [ - sources."busboy-1.6.0" - sources."streamsearch-1.1.0" - ]; - }) - sources."mute-stream-0.0.8" - sources."nan-2.17.0" - sources."negotiator-0.6.3" - sources."node-addon-api-5.1.0" - (sources."node-fetch-2.6.11" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-forge-1.3.1" - sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.13" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.7" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."only-0.0.2" - sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."pako-1.0.11" - sources."papaparse-5.4.1" - sources."parse5-7.1.2" - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-6.2.1" - sources."picocolors-1.0.0" - sources."pify-3.0.0" - sources."process-nextick-args-2.0.1" - sources."proper-lockfile-4.1.2" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."qs-6.11.2" - sources."querystringify-2.2.0" - sources."raw-body-2.5.2" - sources."readable-stream-1.1.14" - sources."requires-port-1.0.0" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."rrweb-cssom-0.6.0" - sources."run-async-2.4.1" - sources."rxjs-7.8.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."saxes-6.0.0" - sources."semver-6.3.1" - sources."set-blocking-2.0.0" - sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."statuses-2.0.1" - sources."steno-0.4.4" - (sources."streaming-json-stringify-3.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - sources."streamsearch-0.1.2" - sources."string-width-4.2.3" - sources."string_decoder-0.10.31" - sources."strip-ansi-6.0.1" - sources."supports-color-5.5.0" - sources."symbol-tree-3.2.4" - (sources."tar-6.1.15" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" - ]; - }) - sources."through-2.3.8" - sources."tldts-6.0.5" - sources."tldts-core-6.0.11" - sources."tmp-0.0.33" - sources."to-fast-properties-2.0.0" - sources."toidentifier-1.0.1" - sources."tough-cookie-4.1.3" - sources."tr46-4.1.1" - sources."tslib-2.6.0" - sources."tsscmp-1.0.6" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."universalify-0.2.0" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" - sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."vary-1.1.2" - sources."w3c-xmlserializer-4.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-7.0.0" - (sources."whatwg-encoding-2.0.0" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-12.0.1" - sources."wide-align-1.1.5" - (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."ws-8.13.0" - sources."xml-name-validator-4.0.0" - sources."xmlchars-2.2.0" - sources."xtend-4.0.2" - sources."yallist-3.1.1" - sources."ylru-1.3.2" - sources."zxcvbn-4.4.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A secure and free password manager for all of your devices."; - homepage = "https://bitwarden.com"; - license = "GPL-3.0-only"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; diff --git a/pkgs/development/node-packages/remove-attr.py b/pkgs/development/node-packages/remove-attr.py index d0f95e3e63a..6ab93e64ffe 100755 --- a/pkgs/development/node-packages/remove-attr.py +++ b/pkgs/development/node-packages/remove-attr.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p +#!nix-shell -i python3 -p python3 import collections.abc import fileinput diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix index 9e7f6db6e69..735496aa459 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "cmdliner"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-oa6Hw6eZQO+NHdWfdED3dtHckm4BmEbdMiAuRkYntfs="; + sha256 = "sha256-r+0QWJAoOU/W9k6XscYX4r5w3m017kfgQjXaMandAHg="; }; nativeBuildInputs = [ ocaml ]; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index f504e3d7ca4..d47b7830776 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,21 +1,26 @@ -{stdenv, lib, fetchurl, ocaml, findlib}: - -let - pname = "dypgen"; -in - -if lib.versionAtLeast ocaml.version "4.06" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else +{ stdenv, lib, fetchFromGitHub, fetchurl, ocaml, findlib }: + +let params = + if lib.versionAtLeast ocaml.version "4.07" then rec { + version = "0.2"; + src = fetchFromGitHub { + owner = "grain-lang"; + repo = "dypgen"; + rev = version; + hash = "sha256-fKuO/e5YbA2B7XcghWl9pXxwvKw9YlhnmZDZcuKe3cs="; + }; + } else if lib.versionOlder ocaml.version "4.06" then { + version = "20120619-1"; + src = fetchurl { + url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; + sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; + }; + } else throw "dypgen is not available for OCaml ${ocaml.version}" +; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "20120619-1"; - - src = fetchurl { - url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; - sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; - }; + pname = "ocaml${ocaml.version}-dypgen"; + inherit (params) src version; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix index c1c890f85f9..240629fc37e 100644 --- a/pkgs/development/ocaml-modules/mm/default.nix +++ b/pkgs/development/ocaml-modules/mm/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "mm"; - version = "0.8.3"; + version = "0.8.4"; duneVersion = "3"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-mm"; rev = "v${version}"; - sha256 = "sha256-pL1e7U5EtbI8bVum7mMHUD8QFMV4jc3YFjhTOvR43kg="; + sha256 = "sha256-RM+vsWf2RK5dY84KcqeR/OHwO42EDycrYgfOUFpUE44="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 3fb52de2b8e..9b9e72ed08d 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -1,23 +1,23 @@ -{ lib, buildDunePackage, fetchurl, ppxlib, alcotest +{ lib, buildDunePackage, fetchurl, ppxlib, alcotest, mdx , ppx_deriving, yaml }: buildDunePackage rec { pname = "ppx_deriving_yaml"; - version = "0.1.1"; + version = "0.2.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; - sha256 = "sha256-nR3568ULM6jaGG4H4+lLBTEJqh/ALHPiJxve40jPUxw="; + hash = "sha256-3vmay8UY7d3j96VOQ+D3oYEotzVls91F51ebXWQ/9SQ="; }; propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; doCheck = true; checkInputs = [ alcotest ]; + nativeCheckInputs = [ mdx.bin ]; meta = { description = "A YAML codec generator for OCaml"; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 18d3d7795ac..6731eb5f1ea 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,19 +1,18 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if lib.versionOlder ocaml.version "4.08" -|| lib.versionAtLeast ocaml.version "5.0" then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-wasm"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "spec"; rev = "opam-${version}"; - sha256 = "sha256:09s0v79x0ymzcp2114zkm3phxavdfnkkq67qz1ndnknbkziwqf3v"; + hash = "sha256-5eo8MIui2GxRS5X9az0NlLGZfxi5KGsTI/EaP6m/zts="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix new file mode 100644 index 00000000000..9a81321898c --- /dev/null +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, asgiref +, httpx +, pdm-backend +, pdm-pep517 +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "a2wsgi"; + version = "1.7.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qQb2LAJQ6wIBEguTQX3QsSsQW12zWvQxv+hu8NxburI="; + }; + + nativeBuildInputs = [ + pdm-backend + pdm-pep517 + ]; + + nativeCheckInputs = [ + asgiref + httpx + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Convert WSGI app to ASGI app or ASGI app to WSGI app"; + homepage = "https://github.com/abersheeran/a2wsgi"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6e0f136e0e1..21325a94422 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gai+o8XVcOj/HidvlictpnbHLUcGrNR+BLkCuEK8b7c="; + hash = "sha256-QIYJ0Xp1MwCHN1LcpGXF+ZjzFV7dRP6faQy1nwBiMFM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix new file mode 100644 index 00000000000..ab5499f7ae9 --- /dev/null +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, aiohttp +, aiohttp-socks +, aioredis +, aresponses +, babel +, certifi +, magic-filter +, pytest-asyncio +, pytest-lazy-fixture +, redis +}: + +buildPythonPackage rec { + pname = "aiogram"; + version = "2.25.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiogram"; + repo = "aiogram"; + rev = "v${version}"; + hash = "sha256-g8nuvna7DpXElvjBehnGKHUsrf+nyQcoKNnyR59RALo="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp>=3.8.0,<3.9.0" "aiohttp" \ + --replace "Babel>=2.9.1,<2.10.0" "Babel" \ + --replace "magic-filter>=1.0.9" "magic-filter" + ''; + + propagatedBuildInputs = [ + aiohttp + babel + certifi + magic-filter + ]; + + nativeCheckInputs = [ + aiohttp-socks + aioredis + aresponses + pytest-asyncio + pytest-lazy-fixture + pytestCheckHook + redis + ]; + + pythonImportsCheck = [ "aiogram" ]; + + meta = with lib; { + description = "Modern and fully asynchronous framework for Telegram Bot API"; + homepage = "https://github.com/aiogram/aiogram"; + changelog = "https://github.com/aiogram/aiogram/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 47dbbc21c4f..a2d14ff72a7 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , aiocoap +, async-interrupt , bleak , bleak-retry-connector , chacha20poly1305 @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.10"; + version = "2.6.11"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2+PqXIKjEJWfTUAJYctWojwoWl7QOfxbbH6c7ZlTNRI="; + hash = "sha256-oTH/YM21l9N03F9zFTOAvxgdG6SyL6qXeeA28jLAOq8="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiocoap + async-interrupt bleak bleak-retry-connector chacha20poly1305 diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index a628dc040b5..bfe6bc06199 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -101,6 +101,10 @@ buildPythonPackage rec { "test_async_with_session" "test_session_close_awaitable" "test_close_run_until_complete_not_deprecated" + # https://github.com/aio-libs/aiohttp/issues/7130 + "test_static_file_if_none_match" + "test_static_file_if_match" + "test_static_file_if_modified_since_past_date" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index b577abf37c8..84020ba7ac5 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0="; }; + # https://github.com/bamthomas/aioimaplib/issues/54 + doCheck = pythonOlder "3.11"; + nativeCheckInputs = [ asynctest docutils diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 2570552ca77..045168b8d16 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.4"; + version = "17.3.21"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MSLZWBgky3PwQxBs1Mj8h/HcerlvzpFvNEZAPoidRpc="; + hash = "sha256-NaSwjU4SfUYeUe/3nWQxfgMYrN4Ez1Dc/PE4ffJmlSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index c2cdb28e399..af681eec8ad 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.3.2"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vKIqBbWQNgv1v73P6K51K+yaqXgC1BtllZ59yTNPr2g="; + hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index b939e508bbc..82a4fc9d784 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,62 +1,74 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, entrypoints -, glibcLocales -, ipython -, jinja2 -, jsonschema +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# Runtime dependencies +, hatchling +, toolz , numpy +, jsonschema +, typing-extensions , pandas +, jinja2 +, importlib-metadata + +# Build, dev and test dependencies +, ipython , pytestCheckHook -, pythonOlder -, recommonmark -, six -, sphinx -, toolz -, typing ? null , vega_datasets +, sphinx }: buildPythonPackage rec { pname = "altair"; - version = "4.2.2"; - disabled = isPy27; + version = "5.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; + src = fetchFromGitHub { + owner = "altair-viz"; + repo = "altair"; + rev = "refs/tags/v${version}"; + hash = "sha256-7bTrfryu4oaodVGNFNlVk9vXmDA5/9ahvCmvUGzZ5OQ="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ - entrypoints + jinja2 jsonschema numpy pandas - six toolz - jinja2 - ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata + ++ lib.optional (pythonOlder "3.11") typing-extensions; nativeCheckInputs = [ - glibcLocales ipython - pytestCheckHook - recommonmark sphinx vega_datasets + pytestCheckHook ]; pythonImportsCheck = [ "altair" ]; - # avoid examples directory, which fetches web resources - preCheck = '' - cd altair/tests - ''; + disabledTestPaths = [ + # Disabled because it requires internet connectivity + "tests/test_examples.py" + # TODO: Disabled because of missing altair_viewer package + "tests/vegalite/v5/test_api.py" + # avoid updating files and dependency on black + "tests/test_toplevel.py" + ]; meta = with lib; { description = "A declarative statistical visualization library for Python."; - homepage = "https://github.com/altair-viz/altair"; + homepage = "https://altair-viz.github.io"; + downloadPage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - platforms = platforms.unix; + maintainers = with maintainers; [ teh vinetos ]; }; } diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index bfaecc90957..16e34408e85 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+LeJDSYtAdWyYu2wDm+r7nr1H+CKGxQI9CnmY/8lc/w="; + hash = "sha256-8nGiGDohzxiFNyvMls9EeUxcV7iFIBS2YhaE6Hep0KU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-vault-rw/default.nix b/pkgs/development/python-modules/ansible-vault-rw/default.nix new file mode 100644 index 00000000000..b5a4c7a0363 --- /dev/null +++ b/pkgs/development/python-modules/ansible-vault-rw/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, ansible-core, ... }: + +buildPythonPackage rec { + pname = "ansible-vault-rw"; + version = "2.1.0"; + src = fetchPypi { + pname = "ansible-vault"; + inherit version; + sha256 = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4"; + }; + propagatedBuildInputs = [ ansible-core ]; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "This project aim to R/W an ansible-vault yaml file."; + homepage = "https://github.com/tomoh1r/ansible-vault"; + changelog = + "https://github.com/tomoh1r/ansible-vault/blob/master/CHANGES.txt"; + license = licenses.gpl3; + maintainers = with maintainers; [ StillerHarpo ]; + }; +} diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index be715ade28f..504fb66a491 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w2dauzM7niQSbgLgSMXN5X2aU1Xj+9G/8Mah4CDMWGw="; + hash = "sha256-ZTS+Z0PWcA/jhBx37SVZOZ+NjPyG2VaRYMmBg0BeCDI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index c04310d28b0..24b9668d12b 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.12.0"; + version = "1.13.2"; optional-dependencies = { server = [ fastapi @@ -125,8 +125,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "argilla-io"; repo = pname; - rev = "v${version}"; - hash = "sha256-NImtS2bbCfbhbrw12xhGdZp/JVfrB6cHnUHYX3xJ7tw="; + rev = "refs/tags/v${version}"; + hash = "sha256-FCPlEbgViWZEyXpdtaa6pJxpgbSXmcfJX/1RUFF7Zs4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 7621c8f68eb..8c7da464c45 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -6,19 +6,14 @@ buildPythonPackage rec { pname = "arpeggio"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { pname = "Arpeggio"; inherit version; - hash = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; + hash = "sha256-x5CysG4ibS3UaOT7+1t/UGzsZkFgMf3hRBzx3ioLpwA="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" - ''; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "arpeggio" ]; @@ -27,6 +22,6 @@ buildPythonPackage rec { description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)"; homepage = "https://github.com/textX/Arpeggio"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index fa78f2f5faa..5e5f9e22fb4 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.14.2"; # Check whether the version is compatible with pylint + version = "2.15.6"; # Check whether the version is compatible with pylint format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SIBzn57UNn/sLuDWt391M/kcCyjCocHmL5qi2cSX2iA="; + hash = "sha256-0oNNEVD8rYGkM11nGUD+XMwE7xgk7mJIaplrAXaECFg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-interrupt/default.nix b/pkgs/development/python-modules/async-interrupt/default.nix new file mode 100644 index 00000000000..b6e16f54963 --- /dev/null +++ b/pkgs/development/python-modules/async-interrupt/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "async-interrupt"; + version = "1.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "async_interrupt"; + rev = "refs/tags/v${version}"; + hash = "sha256-mbvOj1ybCkDNr3je3PtFwmddkh2k/nHOerpC6hGSUYI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=async_interrupt --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "async_interrupt" + ]; + + meta = with lib; { + description = "Context manager to raise an exception when a future is done"; + homepage = "https://github.com/bdraco/async_interrupt"; + changelog = "https://github.com/bdraco/async_interrupt/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 13cbb66055b..a3ca61f9862 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.34.0"; + version = "0.34.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-nowtQbgYkXOHQcbjlPDzhJORzSla1gmUoW9qrW0QujE="; + hash = "sha256-Ktl6YVYd8QpC6eaz3Xe6YyJZhB92ZLL9/XG4WSc2qS8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 67dcb1699ee..44599435f14 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-enSG8rO0gMpSaf6otdx94xncyxc6Uv570VKVVQkit1g="; + hash = "sha256-Yf8/NmQygdikQXv9sUukQEKKd+FcpSPnGbbi8kzVyLo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 91b50e798c5..64f12ed24a1 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -9,7 +9,7 @@ , setuptools # runtime -, ffmpeg +, ffmpeg-headless # tests , numpy @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg + ffmpeg-headless ]; preCheck = '' diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index b72ffdd4ea5..25dfe383e35 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.4.0"; + version = "13.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA="; + hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index c39d5a7c2ae..e3ec3ee71b9 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "24.0.0"; + version = "25.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-sUp3LDVsc1DmVf4HdaXGSDeEvmAE2weSHHTxL/BwRk8="; + hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index b4321d50dba..5195c0102db 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; + hash = "sha256-zgkFMrufHoX3gq9QXo8SlJYZOfV5GlY3pVQXmIWyx7c="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix new file mode 100644 index 00000000000..a48222d9c24 --- /dev/null +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -0,0 +1,198 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch-vcs +, aiohttp +, attrs +, cattrs +, circus +, click +, click-option-group +, cloudpickle +, deepmerge +, fs +, jinja2 +, numpy +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-aiohttp-client +, opentelemetry-instrumentation-asgi +, opentelemetry-sdk +, opentelemetry-semantic-conventions +, opentelemetry-util-http +, packaging +, pathspec +, pip-requirements-parser +, pip-tools +, prometheus-client +, psutil +, pynvml +, python-dateutil +, python-json-logger +, python-multipart +, pyyaml +, requests +, rich +, schema +, simple-di +, starlette +, uvicorn +, watchfiles +, fs-s3fs +, grpcio +, grpcio-health-checking +, opentelemetry-instrumentation-grpc +, protobuf +, grpcio-channelz +, grpcio-reflection +, filetype +, pillow +, pydantic +, pandas +, pyarrow +, opentelemetry-exporter-otlp-proto-http +# https://pypi.org/project/opentelemetry-exporter-jaeger-proto-grpc/ +# , opentelemetry-exporter-jaeger # support for this exporter ends in july 2023 +, opentelemetry-exporter-otlp +# , opentelemetry-exporter-zipkin +, tritonclient +# native check inputs +, pytestCheckHook +, scikit-learn +, lxml +, orjson +, pytest-asyncio +, fastapi +}: + +let + version = "1.1.0"; + aws = [ fs-s3fs ]; + grpc = [ + grpcio + grpcio-health-checking + opentelemetry-instrumentation-grpc + protobuf + ]; + io-file = [ filetype ]; + io-image = io-file ++ [ pillow ]; + io-json = [ pydantic ]; + io-pandas = [ pandas pyarrow ]; + grpc-reflection = grpc ++ [ grpcio-reflection ]; + grpc-channelz = grpc ++ [ grpcio-channelz ]; + monitor-otlp = [ opentelemetry-exporter-otlp-proto-http ]; + # tracing-jaeger = [ opentelemetry-exporter-jaeger ]; + tracing-otlp = [ opentelemetry-exporter-otlp ]; + # tracing-zipkin = [ opentelemetry-exporter-zipkin ]; + io = io-json ++ io-image ++ io-pandas ++ io-file; + tracing = tracing-otlp; # ++ tracing-zipkin ++ tracing-jaeger + optional-dependencies = { + all = aws ++ io ++ grpc ++ grpc-reflection ++ grpc-channelz ++ tracing ++ monitor-otlp; + inherit aws grpc io-file io-image io-json io-pandas io grpc-reflection + grpc-channelz monitor-otlp tracing-otlp tracing; + triton = [ tritonclient ] ++ tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc; + }; +in +buildPythonPackage { + pname = "bentoml"; + inherit version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bentoml"; + repo = "BentoML"; + rev = "v${version}"; + hash = "sha256-ZhgBw/zBazfVNPvcfAlHEGvc9hzVm7aKLXmwwvMmF0A="; + }; + + pythonRelaxDeps = [ + "opentelemetry-semantic-conventions" + ]; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + cattrs + circus + click + click-option-group + cloudpickle + deepmerge + fs + jinja2 + numpy + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-aiohttp-client + opentelemetry-instrumentation-asgi + opentelemetry-sdk + opentelemetry-semantic-conventions + opentelemetry-util-http + packaging + pathspec + pip-requirements-parser + pip-tools + prometheus-client + psutil + pynvml + python-dateutil + python-json-logger + python-multipart + pyyaml + requests + rich + schema + simple-di + starlette + uvicorn + watchfiles + ]; + + passthru.optional-dependencies = optional-dependencies; + + pythonImportsCheck = [ "bentoml" ]; + + preCheck = '' + # required for CI testing + # https://github.com/bentoml/BentoML/pull/4056/commits/66302b502a3f4df4e8e6643d2afefefca974073e + export GITHUB_ACTIONS=1 + ''; + + disabledTestPaths = [ + "tests/e2e" + "tests/integration" + ]; + + disabledTests = [ + # flaky test + "test_store" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + pydantic + scikit-learn + lxml + orjson + pytest-asyncio + pillow + fastapi + starlette + ] ++ optional-dependencies.grpc; + + + meta = with lib; { + description = "Build Production-Grade AI Applications"; + homepage = "https://github.com/bentoml/BentoML"; + changelog = "https://github.com/bentoml/BentoML/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 3d934c49ed7..9ce3dbf8bd0 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.7.6"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OAf5Mjwwi8P5tYy+XQTcKPNKwy2FKZkzTalrQvZLU1Y="; + hash = "sha256-zWmpJqM2PiXpSmRAgwMoPFkIW+ltcVJL2+a/yNouNOA="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 729547d1723..918cba4f54b 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.6.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Doz8T7XuX/8JFu1yutTUxrtvasDLWD3Fp/+JMLEUIQM="; + hash = "sha256-A3zdM2kVmz8cUix9JT8cnIABZK64r6yiZisvb8A1RSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 09f0938782a..e6ac07612c4 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -10,25 +10,26 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.26.79"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.28.9"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-9Xsng4xZ+IGNZ3ViYVrOyKZdRH6QPSjZALj9Q3HECBU="; + hash = "sha256-NkNHA20yn1Q7uoq/EL1Wn8F1fpi1waQujutGIKsnxlI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ botocore jmespath s3transfer - setuptools ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index f6d62659cdd..1693f2258bc 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -3,7 +3,6 @@ , fetchPypi , python-dateutil , jmespath -, docutils , urllib3 , pytestCheckHook , jsonschema @@ -11,17 +10,17 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.29.79"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.9"; # N.B: if you change this, change boto3 and awscli to a matching version + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-x97UQGK+07kolEz7CeFXjtP+0OTJjeTyM/PCBWqNSR4="; + hash = "sha256-vYSdOslfF4E4Xtgx11OgSj7IcKWdZZgXWq7dcdwrr18="; }; propagatedBuildInputs = [ python-dateutil jmespath - docutils urllib3 ]; @@ -30,8 +29,6 @@ buildPythonPackage rec { jsonschema ]; - doCheck = true; - disabledTestPaths = [ # Integration tests require networking "tests/integration" diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 1eaed132fc6..ff79eacf99b 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -8,27 +8,28 @@ , makeFontsConf , freefont_ttf , pikepdf -, pytest -, glibcLocales +, pytestCheckHook , cairo , cffi , numpy , withXcffib ? false , xcffib -, python , glib , gdk-pixbuf +, setuptools }: buildPythonPackage rec { pname = "cairocffi"; - version = "1.4.0"; + version = "1.5.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-UJM5syzNjXsAwiBMMnNs3njbU6MuahYtMSR40lYmzZo="; + hash = "sha256-Bxq3ty41MzALC/1VpSBWtP/cHtbmVneeKs7Ztwm4opU="; }; patches = [ @@ -43,36 +44,23 @@ buildPythonPackage rec { ./fix_test_scaled_font.patch ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" \ - --replace "pytest-cov" "" \ - --replace "pytest-flake8" "" \ - --replace "pytest-isort" "" \ - --replace "--flake8 --isort" "" - ''; - - LC_ALL = "en_US.UTF-8"; - - # checkPhase require at least one 'normal' font and one 'monospace', - # otherwise glyph tests fails - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; + nativeBuildInputs = [ + setuptools + ]; propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; - # pytestCheckHook does not work - nativeCheckInputs = [ numpy pikepdf pytest glibcLocales ]; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; + nativeCheckInputs = [ + numpy + pikepdf + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix index 398e07b39df..4b400f21873 100644 --- a/pkgs/development/python-modules/calver/default.nix +++ b/pkgs/development/python-modules/calver/default.nix @@ -6,37 +6,43 @@ , pytestCheckHook }: -buildPythonPackage rec { - pname = "calver"; - version = "2022.06.26"; - - disabled = pythonOlder "3.5"; - - format = "setuptools"; - - src = fetchFromGitHub { - owner = "di"; - repo = "calver"; - rev = version; - hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "version=calver_version(True)" 'version="${version}"' - ''; - - nativeCheckInputs = [ - pretend - pytestCheckHook - ]; - - pythonImportsCheck = [ "calver" ]; - - meta = { - description = "Setuptools extension for CalVer package versions"; - homepage = "https://github.com/di/calver"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; +let + self = buildPythonPackage rec { + pname = "calver"; + version = "2022.06.26"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "di"; + repo = "calver"; + rev = version; + hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=calver_version(True)" 'version="${version}"' + ''; + + doCheck = false; # avoid infinite recursion with hatchling + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ "calver" ]; + + passthru.tests.calver = self.overridePythonAttrs { doCheck = true; }; + + meta = { + description = "Setuptools extension for CalVer package versions"; + homepage = "https://github.com/di/calver"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 836c270a4c0..1864b58d92d 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.0"; + version = "5.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Hqul7hTYyMC+2PYGPl4Q2r288jUDqGHPDhC3Ih2Zyw0="; + hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 766857a66a8..63304bc8211 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.2.5"; + version = "0.3.0"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-T5mmHUMNbdvexeSaIDZIm/3yQcDKnWdor9IK63FE0no="; + hash = "sha256-/bXpwSBFr1IM04GNEczzsnsjdFV4miUAzJkvrQjfIq4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index c6793137ba2..1f5be76e2d2 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , config -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cupy , fetchFromGitHub , filelock diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 48b040565f7..8a61e660661 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { version = "18.8.0"; format = "setuptools"; - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "CherryPy"; @@ -86,6 +86,20 @@ buildPythonPackage rec { "test_basic_request" "test_3_Redirect" "test_4_File_deletion" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + "testErrorHandling" + "testHookErrors" + "test_HTTP10_KeepAlive" + "test_No_Message_Body" + "test_HTTP11_Timeout" + "testGzip" + "test_malformed_header" + "test_no_content_length" + "test_post_filename_with_special_characters" + "test_post_multipart" + "test_iterator" + "test_1_Ram_Concurrency" + "test_2_File_Concurrency" ] ++ lib.optionals stdenv.isDarwin [ "test_block" ]; diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 6f050c63950..a2ed3295f01 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G4npp0G8TNk2y/T6myNr8NCfkBdcknsWds+XBZiNnQY="; + hash = "sha256-660Frlaj6WbYOl0sfb5ox6qTzE+jKJR0Qka9nEijSyg="; }; patches = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 37e38c47ad5..e0b6126482c 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UpNnvHlsZkDltIDJAl8m1wx79MByRpBjUneiTW0PZr8="; + hash = "sha256-ibxXVHVskDF0DcOWccNKQpWu2V50ZSLCoZHRo+XEZTM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index d02cf1d1e37..3435e20b65e 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.60"; + version = "9.2.61"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CpJiRcaZGM7AOzO1HqCmzWJAFhS2fHmSOJsRLs3VPFc="; + hash = "sha256-iAKHNVAtUdm+ZTk5nXejI7WdEV9sTjLnfZ4B6Wxzk18="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 6844cfb649a..6d748af8b5a 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "click"; - version = "8.1.3"; + version = "8.1.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-doLcivswKXABZ0V16gDRgU2AjWo2r0Fagr1IHTe6e44="; + hash = "sha256-SO6EmVGRlSegRb/jv3uqipWcQjE04aW5jAXCC6daHL0="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index b8816350647..92183fc1622 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -23,7 +23,7 @@ let pythonImportsCheck = [ "constantly" ]; - passthru.tests.constantly = self.overrideAttrs (_: { doInstallCheck = true; }); + passthru.tests.constantly = self.overridePythonAttrs { doCheck = true; }; meta = with lib; { homepage = "https://github.com/twisted/constantly"; diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 86b77b994ea..d8ee18a090d 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -34,7 +33,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - asynctest certifi ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 2ebcb9efffe..076e045d727 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -3,25 +3,25 @@ , callPackage , buildPythonPackage , fetchPypi -, rustPlatform , cargo -, rustc -, setuptools-rust -, openssl -, Security -, isPyPy , cffi +, hypothesis +, iso8601 +, isPyPy +, libiconv +, libxcrypt +, openssl , pkg-config +, pretend +, py , pytestCheckHook , pytest-subtests , pythonOlder -, pretend -, libiconv -, libxcrypt -, iso8601 -, py , pytz -, hypothesis +, rustc +, rustPlatform +, Security +, setuptoolsRustBuildHook }: let @@ -29,20 +29,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "40.0.1"; # Also update the hash in vectors.nix - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "41.0.2"; # Also update the hash in vectors.nix + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI="; + hash = "sha256-fSML+FYWTeFk7LYVzMFMf8beaQbd1bSR86+Q01FMklw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; + hash = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook - setuptools-rust + setuptoolsRustBuildHook cargo rustc pkg-config @@ -100,8 +100,6 @@ buildPythonPackage rec { Cryptography includes both high level recipes and low level interfaces to common cryptographic algorithms such as symmetric ciphers, message digests, and key derivation functions. - Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.5+, and PyPy 5.4+. ''; homepage = "https://github.com/pyca/cryptography"; changelog = "https://cryptography.io/en/latest/changelog/#v" diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 71bd22bf738..554873de89e 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,17 +1,19 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography }: +{ buildPythonPackage, fetchPypi, lib, cryptography, setuptools }: buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version; - format = "setuptools"; + format = "pyproject"; src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-hGBwa1tdDOSoVXHKM4nPiPcAu2oMYTPcn+D1ovW9oEE="; + hash = "sha256-Ao3/lKhSLKgYsRKV/xLfVfNI8zoZPAWX3f6COeU9FYI="; }; + nativeBuildInputs = [ setuptools ]; + # No tests included doCheck = false; @@ -20,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test vectors for the cryptography package"; homepage = "https://cryptography.io/en/latest/development/test-vectors/"; - # Source: https://github.com/pyca/cryptography/tree/master/vectors; + downloadPage = "https://github.com/pyca/cryptography/tree/master/vectors"; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 39341855530..5820914737c 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8Hv+k2d6dVqFVMT9piLvAeIkes6Zs6eBB6qQcODQo8s="; + hash = "sha256-C2heUEDxmfPXA/MPXSLR+GVZdiNFUVPR3ddwJFrvCXU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dashing/default.nix b/pkgs/development/python-modules/dashing/default.nix index d49fd667cdb..9caa56a8764 100644 --- a/pkgs/development/python-modules/dashing/default.nix +++ b/pkgs/development/python-modules/dashing/default.nix @@ -1,21 +1,23 @@ { lib -, python3 +, buildPythonPackage , fetchPypi +, pythonOlder +, blessed }: -python3.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "dashing"; version = "0.1.0"; format = "setuptools"; - disabled = python3.pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ blessed ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b0e10f29a6e..aaa5a5ae6b6 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,46 +1,53 @@ { lib , stdenv -, arrow-cpp -, bokeh , buildPythonPackage +, fetchFromGitHub + +# build-syste +, setuptools +, versioneer + +# dependencies , click , cloudpickle -, distributed -, fastparquet -, fetchFromGitHub -, fetchpatch , fsspec , importlib-metadata -, jinja2 -, numpy , packaging -, pandas , partd +, pyyaml +, toolz + +# optional-dependencies +, numpy , pyarrow +, lz4 +, pandas +, distributed +, bokeh +, jinja2 + +# tests +, arrow-cpp +, hypothesis +, pytest-asyncio , pytest-rerunfailures , pytest-xdist , pytestCheckHook , pythonOlder -, pyyaml -, scipy -, setuptools -, toolz -, versioneer -, zarr }: buildPythonPackage rec { pname = "dask"; - version = "2023.4.1"; - format = "setuptools"; + version = "2023.7.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dask"; - repo = pname; + repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-PkEFXF6OFZU+EMFBUopv84WniQghr5Q6757Qx6D5MyE="; + hash = "sha256-1KnvIMEWT1MwlvkdgH10xk+lGSsGWJMLBonTtWwKjog="; }; nativeBuildInputs = [ @@ -59,13 +66,18 @@ buildPythonPackage rec { toolz ]; - passthru.optional-dependencies = { + passthru.optional-dependencies = lib.fix (self: { array = [ numpy ]; complete = [ - distributed - ]; + pyarrow + lz4 + ] + ++ self.array + ++ self.dataframe + ++ self.distributed + ++ self.diagnostics; dataframe = [ numpy pandas @@ -77,16 +89,16 @@ buildPythonPackage rec { bokeh jinja2 ]; - }; + }); nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures pytest-xdist - scipy - zarr + # from panda[test] + hypothesis + pytest-asyncio ] ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 - fastparquet pyarrow ]; @@ -103,7 +115,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace " --durations=10" "" \ --replace " --cov-config=pyproject.toml" "" \ - --replace " -v" "" + --replace "\"-v" "\" " ''; pytestFlagsArray = [ @@ -120,12 +132,10 @@ buildPythonPackage rec { # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" ] ++ [ - "test_chunksize_files" - # TypeError: 'ArrowStringArray' with dtype string does not support reduction 'min' - "test_set_index_string" - # numpy 1.24 - # RuntimeWarning: invalid value encountered in cast - "test_setitem_extended_API_2d_mask" + # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'? + "test_dot" + "test_dot_nan" + "test_merge_column_with_nulls" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 79f8d3d5cbb..ec386f8e0b2 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "devtools"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; repo = "python-${pname}"; - rev = "v${version}"; - hash = "sha256-x9dL/FE94OixMAmjnmfzZUcYJBqE5P2AAIFsNJF0Fxo="; + rev = "refs/tags/v${version}"; + hash = "sha256-ogogXZnuSFkWktCin+cyefjqIbGFRBVIeOrZJAa3hOE="; }; nativeBuildInputs = [ @@ -47,10 +47,15 @@ buildPythonPackage rec { disabledTests = [ # Test for Windows32 "test_print_subprocess" - # sensitive to timing + # Sensitive to timing "test_multiple_not_verbose" - # sensitive to interpreter output - "test_simple_vars" + # Sensitive to interpreter output + "test_simple" + ]; + + disabledTestPaths = [ + # pytester_pretty is not available in Nixpkgs + "tests/test_insert_assert.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 2abee722b97..a2219ae22cc 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "3.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-wkbFUrvKhdp2Hd4QkXAvhMiaqSXFD/fgIw03nLPaO5I="; + hash = "sha256-+ladx0b/bvvUW8zLjtG8IiWWdfPTqqm/KYbEK9uiFaU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index 379b6364232..774bcda4ba8 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -7,7 +7,7 @@ , django-debug-toolbar , django-extensions , django-taggit -, django_tagging +, django-tagging , mock , pytest-django , selenium @@ -41,7 +41,7 @@ buildPythonPackage rec { django-debug-toolbar django-extensions django-taggit - django_tagging + django-tagging mock pytest-django selenium diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 950cf9ef812..ccb1ffd3c1a 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub + +# build-system +, hatchling + +# non-propagates , django + +# tests , pytest-django , pytestCheckHook }: buildPythonPackage rec { pname = "django-bootstrap3"; - version = "23.1"; + version = "23.4"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cJW3xmqJ87rreOoCh5nr15XSlzn8hgJGBCLnwqGUrTA="; + src = fetchFromGitHub { + owner = "zostera"; + repo = "django-bootstrap3"; + rev = "refs/tags/v${version}"; + hash = "sha256-1/JQ17GjBHH0JbY4EnHOS2B3KhEJdG2yL6O2nc1HNNc="; }; + postPatch = '' + sed -i '/beautifulsoup4/d' pyproject.toml + ''; + nativeBuildInputs = [ - setuptools + hatchling ]; buildInputs = [ @@ -39,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 3 integration for Django"; homepage = "https://github.com/zostera/django-bootstrap3"; - changelog = "https://github.com/zostera/django-bootstrap3/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/zostera/django-bootstrap3/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 480c7891539..568ce0df304 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -3,30 +3,32 @@ , fetchFromGitHub # build-system -, setuptools +, hatchling + +# non-propagates +, django # dependencies , beautifulsoup4 # tests -, django , python }: buildPythonPackage rec { pname = "django-bootstrap4"; - version = "23.1"; + version = "23.2"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; - rev = "v${version}"; - hash = "sha256-55pfUPwxDzpDn4stMEPvrQAexs+goN5SKFvwSR3J4aM="; + rev = "refs/tags/v${version}"; + hash = "sha256-RYGwi+hRfTqPAikrv33w27v1/WLwRvXexSusJKdr2o8="; }; nativeBuildInputs = [ - setuptools + hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix index 2b2fe06de61..3e413ca4e15 100644 --- a/pkgs/development/python-modules/django-celery-results/default.nix +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -7,14 +7,15 @@ }: buildPythonPackage rec { - pname = "django_celery_results"; + pname = "django-celery-results"; version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "django_celery_results"; + inherit version; hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; }; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django-classy-tags/default.nix index 06a336be081..06a336be081 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django-classy-tags/default.nix diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django-colorful/default.nix index 5de127a9722..5de127a9722 100644 --- a/pkgs/development/python-modules/django_colorful/default.nix +++ b/pkgs/development/python-modules/django-colorful/default.nix diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django-contrib-comments/default.nix index 66189a88d0d..66189a88d0d 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django-contrib-comments/default.nix diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix index bb3cd1acf7c..bb3cd1acf7c 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django-environ/default.nix diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 47719995c69..18ef2e3ace7 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -11,7 +11,7 @@ # dependencies , django -, django_compat +, django-compat # tests , pytest-django @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - django_compat + django-compat ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix index f921077934f..f579a31dc3e 100644 --- a/pkgs/development/python-modules/django-js-asset/default.nix +++ b/pkgs/development/python-modules/django-js-asset/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , django , python }: buildPythonPackage rec { pname = "django-js-asset"; - version = "2.0"; - format = "setuptools"; + version = "2.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YDOmbqB0xDBAlOSO1UBYJ8VfRjJ8Z6Hw1i24DNSrnjw="; + hash = "sha256-rxJ9TgVBiJByiFSLTg/dtAR31Fs14D4sh2axyBcKGTU="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index b7fbc9f2b17..b7fbc9f2b17 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django-nose/default.nix index 2506f6aba44..2506f6aba44 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django-nose/default.nix diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 5a2a8e5786d..ce03a1330f5 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -47,10 +47,12 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; + # xdist is disabled right now because it can cause race conditions on high core machines + # https://github.com/jazzband/django-oauth-toolkit/issues/1300 nativeCheckInputs = [ djangorestframework pytest-django - pytest-xdist + # pytest-xdist pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index f590aca527f..673a8679726 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, - numpy, django_colorful, pillow, psycopg2, + numpy, django-colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require a postgresql + postgis server doCheck = false; - propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + propagatedBuildInputs = [ numpy django-colorful pillow psycopg2 pyparsing django celery boto3 importlib-metadata ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 3c4e351f25b..0c28ee283a1 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, django_classytags +, django-classy-tags , pytestCheckHook , pytest-django }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django_classytags + django-classy-tags ]; checkInputs = [ diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index 0b420e9362c..0b420e9362c 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index 41637e7472c..96811351269 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-tables2"; - version = "2.4.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jieter"; repo = pname; rev = "v${version}"; - sha256 = "04vvgf18diwp0mgp14b71a0dxhgrcslv1ljybi300gvzvzjnp3qv"; + hash = "sha256-n8qvsm/i+2VclFc00jQGO0Z4l6Ke8qZ03EYuEQcPuVQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django-tagging/default.nix index 4bcaa549a12..4bcaa549a12 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django-tagging/default.nix diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix index dd6e054b55c..dd6e054b55c 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django-treebeard/default.nix diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 01e3dd2cb55..402272fb54b 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -9,29 +9,29 @@ , h2 , httpx , idna +, poetry-core , pytestCheckHook , pythonOlder , requests , requests-toolbelt -, setuptools-scm , sniffio , trio }: buildPythonPackage rec { pname = "dnspython"; - version = "2.3.0"; - format = "setuptools"; + version = "2.4.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ik4ysD60a+cOEu9tZOC+Ejpk5iGrTAgi/21FDVKlQLk="; + hash = "sha256-wzlxx5r1vpaLuJfpXCRI4RpkXuhNk7Jlzgt6q+Xf3Kg="; }; nativeBuildInputs = [ - setuptools-scm + poetry-core ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/dokuwiki/default.nix b/pkgs/development/python-modules/dokuwiki/default.nix new file mode 100644 index 00000000000..0d221c3b73b --- /dev/null +++ b/pkgs/development/python-modules/dokuwiki/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "dokuwiki"; + version = "1.3.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gtTyO6jmjQT0ZwmxvH+RAe1v5aruNStfP1qz1+AqYXs="; + }; + + pythonImportsCheck = [ + "dokuwiki" + ]; + + meta = with lib; { + homepage = "https://github.com/fmenabe/python-dokuwiki"; + description = "A python module that aims to manage DokuWiki wikis by using the provided XML-RPC API"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index e9c3a752b0d..aeb90488dfd 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-wwR7ZdbWFNRgxQubdgriDke5W6u7VNsNZV9xqQypSrY="; + hash = "sha256-O47676BOuCx3wMpeuRATQOAWZQev+R+OxZi4boQABmc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 0ffe64f62c2..c50b5042a6c 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.17.0"; + version = "6.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Tyot/JswIiwxugjxyHcENDAGF9uxwaptTIZwU/GnjAU="; + hash = "sha256-s4aM2HuagqcF2sLHHRh2kj1tglf+JZ7hXT4PcAeFStQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 827ee3421bc..b9efe304226 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.1.4"; + version = "4.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-cU22JdrCTvg8cF1LK9dYfOTztp3qoXV9VK6aMpbKFHc="; + hash = "sha256-5K2xcnTo3/A6/pCxQn5qZqni7C64p/yNAWWJlhQeKe4="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 2f358ba9832..35c702ea06d 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -5,9 +5,10 @@ , pythonOlder , dnspython , greenlet +, isPyPy , monotonic , six -, nose +, nose3 , iana-etc , pytestCheckHook , libredirect @@ -35,10 +36,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - nose + nose3 ]; - doCheck = !stdenv.isDarwin; + # libredirect is not available on darwin + # tests hang on pypy indefinitely + doCheck = !stdenv.isDarwin && !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 0e4d38c290c..2269445282b 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -7,20 +7,29 @@ , flask-sqlalchemy , mongoengine , pytestCheckHook +, pythonOlder , sqlalchemy +, sqlalchemy-utils }: buildPythonPackage rec { pname = "factory-boy"; - version = "3.2.1"; + version = "3.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "factory_boy"; inherit version; - hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; + hash = "sha256-vHbZfRplu9mEKm1yKIIJjrVJ7I7hCB+fsuj/KfDDAPE="; }; + postPatch = '' + substituteInPlace tests/test_version.py \ + --replace '"3.2.1.dev0")' '"${version}")' + ''; + propagatedBuildInputs = [ faker ]; @@ -32,6 +41,7 @@ buildPythonPackage rec { mongoengine pytestCheckHook sqlalchemy + sqlalchemy-utils ]; # Checks for MongoDB requires an a running DB @@ -51,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to create factories for complex objects"; homepage = "https://github.com/rbarrois/factory_boy"; + changelog = "https://github.com/FactoryBoy/factory_boy/blob/${version}/docs/changelog.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 4dc36fd5fc2..563c4b7e4f4 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; rev = "v${version}"; - hash = "sha256-p8BJ+Bdvn+AQSUS6b2GeYNh2l4KXfPx3o0kImu7xVgw="; + hash = "sha256-NTk0S+dMChygnC7Wix62AFO4NNSPJuKXyqoEyWiQhII="; }; postPatch = '' diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 62a65cfbdf6..3215a901088 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.12.0"; + version = "3.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/AOuQyiMAT0uqDyFlwAbESnbNRqtnFf+JAkyeRa45xg="; + hash = "sha256-ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index ff246c4a0e9..2570b1a274b 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -1,53 +1,47 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, pythonAtLeast , pbr +, setuptools , testtools , mock -, python -, six +, pytestCheckHook }: buildPythonPackage rec { pname = "fixtures"; - version = "3.0.0"; + version = "4.1.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"; + hash = "sha256-grHF5p9hVSbvbAZxiKHmxgZ99/iDMlCcmfi4/buXdvM="; }; - patches = lib.optionals (pythonAtLeast "3.9") [ - # drop tests that try to monkeypatch a classmethod, which fails on python3.9 - # https://github.com/testing-cabal/fixtures/issues/44 - (fetchpatch { - url = "https://salsa.debian.org/openstack-team/python/python-fixtures/-/raw/debian/victoria/debian/patches/remove-broken-monkey-patch-test.patch"; - sha256 = "1s3hg2zmqc4shmnf90kscphzj5qlqpxghzw2a59p8f88zrbsj97r"; - }) - ]; - nativeBuildInputs = [ pbr + setuptools ]; propagatedBuildInputs = [ - testtools - six # not in install_requires, but used in fixture.py + pbr ]; + passthru.optional-dependencies = { + streams = [ + testtools + ]; + }; + nativeCheckInputs = [ mock - ]; - - checkPhase = '' - ${python.interpreter} -m testtools.run fixtures.test_suite - ''; + pytestCheckHook + ] ++ passthru.optional-dependencies.streams; meta = { description = "Reusable state for writing clean tests and more"; - homepage = "https://pypi.python.org/pypi/fixtures"; + homepage = "https://pypi.org/project/fixtures/"; + changelog = "https://github.com/testing-cabal/fixtures/blob/${version}/NEWS"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index f30598797a7..b32fc7b25af 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,38 +1,36 @@ { lib +, asgiref , buildPythonPackage , fetchFromGitHub - , flask +, hiro , limits , ordered-set -, rich -, typing-extensions - -, asgiref -, hiro , pymemcache +, pymongo , pytest-mock , pytestCheckHook +, pythonOlder , redis -, pymongo +, rich +, typing-extensions }: buildPythonPackage rec { pname = "flask-limiter"; - version = "3.1.0"; + version = "3.3.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-eAJRqyAH1j1NHYfagRZM2fPE6hm9+tJHD8FMqvgvMBI="; + hash = "sha256-YDVZ/dD+TRJEnJRTRmGEB6EIkK5eQ5MdXh8FideoVDQ="; }; postPatch = '' - substituteInPlace requirements/main.txt \ - --replace "rich>=12,<13" "rich" - sed -i "/--cov/d" pytest.ini # flask-restful is unmaintained and breaks regularly, don't depend on it @@ -82,11 +80,14 @@ buildPythonPackage rec { "tests/test_storage.py" ]; - pythonImportsCheck = [ "flask_limiter" ]; + pythonImportsCheck = [ + "flask_limiter" + ]; meta = with lib; { description = "Rate limiting for flask applications"; homepage = "https://flask-limiter.readthedocs.org/"; + changelog = "https://github.com/alisaifee/flask-limiter/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index fae29247dea..ed55629dca0 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -1,7 +1,13 @@ { lib -, python3 , buildPythonPackage , fetchPypi + +# build-system +, poetry-core + +# propagates +, typing-extensions +, repath }: buildPythonPackage rec { @@ -15,13 +21,13 @@ buildPythonPackage rec { hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw="; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ - typing-extensions + propagatedBuildInputs = [ repath + typing-extensions ]; doCheck = false; diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 95382a88c95..4c41e597260 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -1,7 +1,20 @@ { lib -, python3 , buildPythonPackage , fetchPypi + +# build-system +, poetry-core + +# propagates +, flet-core +, httpx +, oauthlib +, packaging +, typing-extensions +, watchdog +, websocket-client +, websockets + }: buildPythonPackage rec { @@ -20,11 +33,11 @@ buildPythonPackage rec { --replace 'watchdog = "^2' 'watchdog = ">=2' ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ flet-core typing-extensions websocket-client diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 43d8d8e90ef..a1be6821b2f 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.8.0"; + version = "3.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - hash = "sha256-iXf9K/xI4u+dDV0Zf6S08nbws4NqycrTEW0B8/qCjQc="; + hash = "sha256-yl2+PcKr7xRW4oIBWl+gzh/nKhSNu5GH9fWKRGgaNHU="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/pypa/flit/blob/${version}/doc/history.rst"; description = "A simple packaging tool for simple packages"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index ed879a2af8a..cdb7fd1ea9e 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-QQz4wWfCMqNzu2QMoF0nfAKcMyvUHKTMsNVGt+7zkpE="; + hash = "sha256-+eklvdmlWrwvdI6IwNyAIEI0kDlzIYh7bzNY94dzA+E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix index b6fdb148edb..2be3f227baf 100644 --- a/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; rev = "v${version}"; - hash = "sha256-yApMUTO6Kq2YESGMpkU4/FlN57+hX0uQr2fGH7QIdUE="; + hash = "sha256-4JhzrRnpb9+FYXd0S2XcBelaHuRksm8RC29rxZqtlpw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fontawesomefree/default.nix b/pkgs/development/python-modules/fontawesomefree/default.nix new file mode 100644 index 00000000000..2b001fecaf8 --- /dev/null +++ b/pkgs/development/python-modules/fontawesomefree/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "fontawesomefree"; + version = "6.4.0"; + format = "wheel"; + + # they only provide a wheel + src = fetchPypi { + inherit pname version format; + dist = "py3"; + python = "py3"; + hash = "sha256-4S7a1xts9pk/x8aupjZ+Ex8vJHtkNfrKmbEjKbrNKyc="; + }; + + pythonImportsCheck = [ + "fontawesomefree" + ]; + + meta = with lib; { + homepage = "https://github.com/FortAwesome/Font-Awesome"; + description = "Icon library and toolkit"; + license = with licenses; [ ofl cc-by-40 ]; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index ec57bfd114d..52428bc3c4e 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 ]; diff --git a/pkgs/development/python-modules/glad2/default.nix b/pkgs/development/python-modules/glad2/default.nix index 47728d793b0..57ee88c4997 100644 --- a/pkgs/development/python-modules/glad2/default.nix +++ b/pkgs/development/python-modules/glad2/default.nix @@ -1,9 +1,10 @@ { lib -, python3 +, buildPythonPackage , fetchPypi +, jinja2 }: -python3.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "glad2"; version = "2.0.4"; format = "setuptools"; @@ -13,15 +14,18 @@ python3.pkgs.buildPythonPackage rec { hash = "sha256-7eFjn2nyugjx9JikCnB/NKYJ0k6y6g1sk2RomnmM99A="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ jinja2 ]; + # no python tests + doCheck = false; + pythonImportsCheck = [ "glad" ]; meta = with lib; { description = "Multi-Language GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specifications"; - homepage = "https://pypi.org/project/glad2"; + homepage = "https://github.com/Dav1dde/glad"; license = licenses.mit; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 6a67b978986..773eea02e4b 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.19.0"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EebMccj9DmrPj+/GCECLkqplq3bSmRkNqlI3gYq0qzo="; + hash = "sha256-PUeEqed0crzfHLAHDDu4GgktMaNt11nuovfMIkz5iwk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 68dc792aecf..0e85af5045b 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.1.2"; + version = "3.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VQwDK9FRbHy/AFbdZKmvl5e52smSCyWTrs00DvJqVmo="; + hash = "sha256-33Z6W2dAsj5VXt3E7XJtUFiq7yFlCixnFnhbAUv+xgU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index f20e251fadd..d80ed27297c 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -4,7 +4,7 @@ , python , cairocffi , django -, django_tagging +, django-tagging , fetchFromGitHub , fetchpatch , gunicorn @@ -49,7 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cairocffi django - django_tagging + django-tagging gunicorn pyparsing python-memcached diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 532481fbeeb..0d00eaa22dd 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper gobject-introspection ]; buildInputs = [ - glibcLocales gobject-introspection gtk3 libsoup libsecret + glibcLocales gtk3 libsoup libsecret ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 8c543bce857..26822853ee2 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , eventlet , gevent @@ -11,24 +10,17 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "20.1.0"; + version = "21.2.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "benoitc"; repo = "gunicorn"; rev = version; - hash = "sha256-xdNHm8NQWlAlflxof4cz37EoM74xbWrNaf6jlwwzHv4="; + hash = "sha256-xP7NNKtz3KNrhcAc00ovLZRx2h6ZqHbwiFOpCiuwf98="; }; - patches = [ - (fetchpatch { - # fix eventlet 0.30.3+ compability - url = "https://github.com/benoitc/gunicorn/commit/6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8.patch"; - hash = "sha256-+iApgohzPZ/cHTGBNb7XkqLaHOVVPF26BnPUsvISoZw="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=gunicorn --cov-report=xml" "" diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 35187aff512..8a886112fed 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -5,11 +5,11 @@ # runtime , editables -, importlib-metadata # < 3.8 , packaging , pathspec , pluggy , tomli +, trove-classifiers # tests , build @@ -18,27 +18,24 @@ , virtualenv }: -let +buildPythonPackage rec { pname = "hatchling"; - version = "1.13.0"; -in -buildPythonPackage { - inherit pname version; + version = "1.18.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+NJ1osxyBzUoa3wuK8NdoFdh5tNpXC+kFlUDlfEMU8c="; + hash = "sha256-UOmcMRDOCvw/e9ut/xxxwXdY5HZzHCdgeUDPpmhkico="; }; - # listed in backend/src/hatchling/ouroboros.py + # listed in backend/pyproject.toml propagatedBuildInputs = [ editables packaging pathspec pluggy - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + trove-classifiers ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; @@ -54,7 +51,6 @@ buildPythonPackage { # listed in /backend/tests/downstream/requirements.txt nativeCheckInputs = [ build - packaging requests virtualenv ]; diff --git a/pkgs/development/python-modules/hfst/default.nix b/pkgs/development/python-modules/hfst/default.nix new file mode 100644 index 00000000000..b865c4c84d6 --- /dev/null +++ b/pkgs/development/python-modules/hfst/default.nix @@ -0,0 +1,45 @@ +{ lib +, pkgs +, stdenv +, buildPythonPackage +, foma +, icu +, swig +}: + +buildPythonPackage rec { + pname = "hfst"; + inherit (pkgs.hfst) version src; + + sourceRoot = "${src.name}/python"; + + postPatch = '' + # omorfi-python looks for 'hfst' Python package + sed -i 's/libhfst_swig/hfst/' setup.py; + ''; + + nativeBuildInputs = [ + swig + ]; + + buildInputs = [ + icu + pkgs.hfst + ]; + + setupPyBuildFlags = [ + "--inplace" + ]; + + # Find foma in Darwin tests + preCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="${foma}/lib" + ''; + + meta = with lib; { + description = "Python bindings for HFST"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + }; +} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 61e47ab064c..0f3f8ae6605 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.28"; + version = "0.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4="; + hash = "sha256-ijhqu0LzQzpjDSe9ZjNhgdjq/DJuD7oVbRTLX97nGHM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index 0964bbf89ca..aeec391e1cb 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , jsonschema , pytestCheckHook , python-dateutil @@ -12,6 +13,9 @@ buildPythonPackage rec { version = "0.0.16"; format = "pyproject"; + # ValueError: mutable default <class 'tests.conftest.Point'> for field a is not allowed: use default_factory + disabled = pythonAtLeast "3.11"; + src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 85a6b7b5a0e..bae4dc5a71d 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.0"; + version = "1.10.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g8vdg7YU3rkXW85U4w9Hvb6u9uvoDphbkIlVXchCRxQ="; + hash = "sha256-zNhqiWYZ3tv6lwYgmi6Yue+mFcgk7Y1dDMbzWlsvVJM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix new file mode 100644 index 00000000000..42bc3aa18ad --- /dev/null +++ b/pkgs/development/python-modules/html5tagger/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "html5tagger"; + version = "1.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "html5tagger"; + rev = "v${version}"; + hash = "sha256-Or0EizZC9FMjTcbgecDvgGB09KNGyxHreSDojgB7ysg="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "html5tagger" + ]; + + meta = with lib; { + description = "Create HTML documents from Python"; + homepage = "https://github.com/sanic-org/html5tagger"; + license = licenses.unlicense; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 863a5631705..9f3905f5518 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -13,11 +13,14 @@ , pythonOlder , sniffio , socksio +# for passthru.tests +, httpx +, httpx-socks }: buildPythonPackage rec { pname = "httpcore"; - version = "0.16.3"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +29,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3bC97CTZi6An+owjoJF7Irtr7ONbP8RtNdTIGJRy0Ng="; + hash = "sha256-qAoORhzBbjXxgtzTqbAxWBxrohzfwDWm5mxxrgeXt48="; }; propagatedBuildInputs = [ @@ -70,7 +73,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + passthru.tests = { + inherit httpx httpx-socks; + }; + meta = with lib; { + changelog = "https://github.com/encode/httpcore/releases/tag/${version}"; description = "A minimal low-level HTTP client"; homepage = "https://github.com/encode/httpcore"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index ffbea1b67c8..11204ec8b9b 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.23.3"; + version = "0.24.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZLRzkyoFbAY2Xs1ORWBqvc2gpKovg9wRs/RtAryOcVg="; + hash = "sha256-qG6fgijNgQKjpSG6sg0+0yqeAU6qV7czR8NgWe63LIg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d1c16d8becb..2bc949f040d 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.25"; + version = "2.5.26"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kqeqo0qWE9O9Q57Ef/0zTSGR04ubYibFFs6FzP9UQys="; + hash = "sha256-gpvfj9XwhErMPXWygZb5QMHDwCK7ZhGw6L86ttRoP/Y="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix index da55df0ac3e..a126030d0cb 100644 --- a/pkgs/development/python-modules/ipyniivue/default.nix +++ b/pkgs/development/python-modules/ipyniivue/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ipyniivue"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vFbEV/ZMXvKZeQUR536OZQ/5uIkt4tOWcCGRPMdc34I"; + hash = "sha256-kym7949VI6C+62p3IOQ2QIzWnuSBcrmySb83oqUwhjI="; }; nativeBuildInputs = [ hatchling hatch-jupyter-builder ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index c7e84e4c11a..b3d3138ab44 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -27,7 +27,7 @@ , scipy , stdenv # Options: -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 2bcf5e9c17c..bf93bf1a5a2 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -40,8 +40,9 @@ , snappy , zlib +, config # CUDA flags: -, cudaSupport ? false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} # MKL: diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 7317ee8fc14..84e693bb722 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,32 +1,53 @@ { lib -, pythonAtLeast -, pythonOlder , buildPythonPackage +, pythonOlder , fetchPypi , stdenv -, numpydoc -, pytestCheckHook -, lz4 + +# build-system , setuptools -, sphinx + +# propagates (optional, but unspecified) +# https://github.com/joblib/joblib#dependencies +, lz4 , psutil + +# tests +, pytestCheckHook +, threadpoolctl }: buildPythonPackage rec { pname = "joblib"; - version = "1.2.0"; + version = "1.3.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; + hash = "sha256-H5N5Bt9lMpupgBPclpL+IqTF5KZIES3lAFCLGKIbQeM="; }; - nativeCheckInputs = [ sphinx numpydoc pytestCheckHook psutil ]; - propagatedBuildInputs = [ lz4 setuptools ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lz4 + psutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + threadpoolctl + ]; + + pytestFlagsArray = [ + "joblib/test" + ]; - pytestFlagsArray = [ "joblib/test" ]; disabledTests = [ "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests @@ -36,6 +57,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/joblib/joblib/releases/tag/${version}"; description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = "https://joblib.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 94d67e131c0..4cd2a2886d6 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsbeautifier"; - version = "1.14.8"; + version = "1.14.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1MTiY6Qt1hlK+52+VHEL48VgRJLL7D6JyS3ZhRP5i58="; + hash = "sha256-xzjrw2tHvZTkym3RepAEw8x07a1YLKHWDg5dWUWmPLk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 6dfa6914f42..6d2c8b10108 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.9.0"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - hash = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; + hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; propagatedBuildInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 2d7d82fd6e4..3353e5ec438 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -2,29 +2,40 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder + +# build , poetry-core -, jsonschema + +# propagates , pathable , pyyaml -, typing-extensions +, referencing +, requests + +# tests , pytestCheckHook +, responses }: buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.1.4"; + version = "0.2.3"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kLCV9WPWGrVgpbueafMVqtGmj3ifrBzTChE2kyxpyZk="; + hash = "sha256-Sa97DwPnGMLmT00hVdkoGO7C0vrvtwxvUvv9lq4nCY4="; }; postPatch = '' - sed -i "/--cov/d" pyproject.toml + sed -i "/^--cov/d" pyproject.toml + + substituteInPlace pyproject.toml \ + --replace 'referencing = ">=0.28.0,<0.30.0"' 'referencing = ">=0.28.0"' ''; nativeBuildInputs = [ @@ -32,14 +43,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jsonschema pathable pyyaml - typing-extensions + referencing + requests ]; nativeCheckInputs = [ pytestCheckHook + responses ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix new file mode 100644 index 00000000000..54b8d6df6ea --- /dev/null +++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hatch-vcs +, hatchling +, importlib-resources +, pytestCheckHook +, pythonOlder +, referencing +}: + +buildPythonPackage rec { + pname = "jsonschema-specifications"; + version = "2023.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "jsonschema_specifications"; + inherit version; + hash = "sha256-yRpQQE6Iofa6QGNneOLuCPbiTFYT/kxTrCRXilp/crs="; + }; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + referencing + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonschema_specifications" + ]; + + meta = with lib; { + description = "Support files exposing JSON from the JSON Schema specifications"; + homepage = "https://github.com/python-jsonschema/jsonschema-specifications"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 52bc89511d2..a23e3a5b931 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -5,13 +5,13 @@ , hatch-fancy-pypi-readme , hatch-vcs , hatchling -, importlib-metadata , importlib-resources +, jsonschema-specifications , pkgutil-resolve-name -, pyrsistent +, pytestCheckHook , pythonOlder -, twisted -, typing-extensions +, referencing +, rpds-py # optionals , fqdn @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.17.3"; + version = "4.18.4"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; + hash = "sha256-+zZCc1OZ+pWMDSqtcFeQFVRZbGM0n09rKDxJPPaSol0="; }; postPatch = '' @@ -49,10 +49,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - pyrsistent - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions + jsonschema-specifications + referencing + rpds-py ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources pkgutil-resolve-name @@ -82,20 +81,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - twisted + pytestCheckHook ]; - checkPhase = '' - export JSON_SCHEMA_TEST_SUITE=json - trial jsonschema - ''; - pythonImportsCheck = [ "jsonschema" ]; meta = with lib; { - description = "An implementation of JSON Schema validation for Python"; + description = "An implementation of JSON Schema validation"; homepage = "https://github.com/python-jsonschema/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 317b42d8a17..0c93b391bf6 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -15,6 +15,7 @@ , jinja2 , tornado , pyzmq +, flaky , ipykernel , traitlets , jupyter-core @@ -23,6 +24,7 @@ , jupyter-server-terminals , nbformat , nbconvert +, overrides , send2trash , terminado , prometheus-client @@ -33,14 +35,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.0.6"; + version = "2.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8="; + hash= "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38="; }; nativeBuildInputs = [ @@ -60,6 +62,7 @@ buildPythonPackage rec { jupyter-server-terminals nbformat nbconvert + overrides send2trash terminado prometheus-client @@ -68,6 +71,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + flaky ipykernel pandoc pytestCheckHook @@ -78,12 +82,17 @@ buildPythonPackage rec { requests ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + preCheck = '' export HOME=$(mktemp -d) export PATH=$out/bin:$PATH ''; disabledTests = [ + "test_server_extension_list" "test_cull_idle" ] ++ lib.optionals stdenv.isDarwin [ # attempts to use trashcan, build env doesn't allow this @@ -103,6 +112,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/jupyter-server/jupyter_server/releases/tag/v${version}"; description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; homepage = "https://github.com/jupyter-server/jupyter_server"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index a761c978593..a9b15b4390d 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-VAm/jHeG/LfLpouHc3mSX8Kr8u/keHY552dLzoGaPrQ="; + hash = "sha256-w0LdGPVsxTi7jlfS/HSBEZdjL9ZKclucnBVViwrVC6Y="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast kasa crypt"; homepage = "https://github.com/bdraco/kasa-crypt"; - changelog = "https://github.com/bdraco/kasa-crypt/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index c729e1da536..1905434759a 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.13.1"; + version = "24.2.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng="; + hash = "sha256-ygdGoZ7EISGfTXE/hI+il6ZhqKjBUEhn5Vv7XgkJFQk="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Store and access your passwords safely"; homepage = "https://github.com/jaraco/keyring"; - changelog = "https://github.com/jaraco/keyring/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ lovek323 dotlambda ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 9ba249f5281..f7c9ce32bb8 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -4,43 +4,36 @@ , azure-servicebus , backports-zoneinfo , buildPythonPackage -, cached-property , case , fetchPypi , hypothesis -, importlib-metadata , pyro4 , pytestCheckHook , pythonOlder , pytz , vine +, typing-extensions }: buildPythonPackage rec { pname = "kombu"; - version = "5.3.0"; + version = "5.3.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0ITsH5b3p8N7qegWgjvbwI8Px92zpb5VWAXmkhAil9g="; + hash = "sha256-+9dXLZLAv3HBEqa0UWMVPepae2pwHsFrVown0P0jcPI="; }; - postPatch = '' - substituteInPlace requirements/test.txt \ - --replace "pytz>dev" "pytz" - ''; - propagatedBuildInputs = [ amqp vine + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo - ] ++ lib.optionals (pythonOlder "3.8") [ - cached-property - importlib-metadata ]; nativeCheckInputs = [ @@ -58,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/celery/kombu/releases/tag/v${version}"; description = "Messaging library for Python"; homepage = "https://github.com/celery/kombu"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 14d23a96d26..a95db865098 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,5 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi -, pbr, python-ldap, prettytable, fixtures, testresources, testtools }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, python-ldap +, prettytable +, six +, fixtures +, testresources +, testtools +}: buildPythonPackage rec { pname = "ldappool"; @@ -20,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ python-ldap prettytable ]; + propagatedBuildInputs = [ python-ldap prettytable six ]; nativeCheckInputs = [ fixtures testresources testtools ]; diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 61da9ab7591..a8d3a6399e6 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-j28OQkJymkh6tIGYLoZLad7OUUImjZqXdqM2zU3haac="; + hash = "sha256-I1kVGbZI1hQRNv0e44giWiMqmeqaqFZks20IyFQ9VIU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 6b141af3c96..699bbabdfc7 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -9,7 +9,9 @@ , six , nose , mako -, cudaSupport ? false, cudaPackages +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } , openclSupport ? true, ocl-icd, clblas }: diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index cf43f6861c5..db531a65778 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.2"; + version = "4.9.3-3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/lxml-${version}"; - hash = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; + hash = "sha256-Vrizi+6jUUEx7qODU4PAH5ZmvBIyT9H18+QpYB0m1f4="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/macaddress/default.nix b/pkgs/development/python-modules/macaddress/default.nix new file mode 100644 index 00000000000..2849506671b --- /dev/null +++ b/pkgs/development/python-modules/macaddress/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, hypothesis +, reprshed +}: + +buildPythonPackage rec { + pname = "macaddress"; + version = "2.0.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mentalisttraceur"; + repo = "python-macaddress"; + rev = "v${version}"; + hash = "sha256-2eD5Ui8kUduKLJ0mSiwaz7TQSeF1+2ASirp70V/8+EA="; + }; + + pythonImportsCheck = [ + "macaddress" + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + reprshed + ]; + + pytestFlagsArray = [ + "$src/test.py" + ]; + + meta = with lib; { + homepage = "https://github.com/mentalisttraceur/python-macaddress"; + description = "A module for handling hardware identifiers like MAC addresses"; + license = licenses.bsd0; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 1d7e6eb9225..3e871a90562 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -27,16 +27,16 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-HOM7BlrKpqm16plTMLFpC6VScEoMlxCJFhZ0mcIFIcE="; + hash = "sha256-YYbdd0GLVKE7+Oi0mpQjqhFdjdlquk/XnIg5WrtKcfI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/magic-filter/default.nix b/pkgs/development/python-modules/magic-filter/default.nix new file mode 100644 index 00000000000..8a3a0fff574 --- /dev/null +++ b/pkgs/development/python-modules/magic-filter/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hatchling +}: + +buildPythonPackage rec { + pname = "magic-filter"; + version = "1.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiogram"; + repo = "magic-filter"; + rev = "v${version}"; + hash = "sha256-mHqq/ci8uMACNutwmxKX1nrl3nTSnSyU2x1VxzWxqzM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "magic_filter" ]; + + meta = with lib; { + description = "Magic filter based on dynamic attribute getter"; + homepage = "https://github.com/aiogram/magic-filter"; + changelog = "https://github.com/aiogram/magic-filter/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 9ad29d3a2c2..7de193bbbbd 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.4.3"; + version = "3.4.4"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-o2MDsrSkR0fMA5I8AoQcJrpwNGO5lXJn8O47tQN7U6o="; + hash = "sha256-5PIIhbJVsotGwZ3BQ4x0I7WjgnGF3opNrn8J+xZCflg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 01033983d4b..2cfd5d21db1 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -121,6 +121,8 @@ buildPythonPackage rec { setuptools setuptools-scm numpy + ] ++ lib.optionals enableGtk3 [ + gobject-introspection ]; buildInputs = [ @@ -131,7 +133,6 @@ buildPythonPackage rec { ghostscript ] ++ lib.optionals enableGtk3 [ cairo - gobject-introspection gtk3 ] ++ lib.optionals enableTk [ libX11 diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9a146402da6..ff223339b43 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.1.10"; + version = "2.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-pa3hSrulnTfoOmNkaWvsqdd7ow+qENPJlBHFoFooZhw="; + hash = "sha256-nYbnOlD3yC3aoSSY4jwSgTv/m56I+ral2GwmoyQij1M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh new file mode 100644 index 00000000000..d2535d1fd59 --- /dev/null +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -0,0 +1,6 @@ +# Add all of mesonFlags to -Csetup-args for pypa builds +for f in $mesonFlags; do + pypaBuildFlags+=" -Csetup-args=$f" + # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html + pipBuildFlags+=" --config-settings=setup-args=$f" +done diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 20008b2b534..866512a4cfd 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.12.1"; + version = "0.13.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-PVs+WB1wpYqXucEWp16Xp2zEtMfnX6Blj8g5I3Hi8sI="; + hash = "sha256-Y7MXAAFCXEL6TP7a25BRy9KJJf+O7XxA02ugCZ48dhg="; }; nativeBuildInputs = [ @@ -39,6 +39,9 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + setupHooks = [ + ./add-build-flags.sh + ]; # Ugly work-around. Drop ninja dependency. # We already have ninja, but it comes without METADATA. diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index d9e537b057d..9eda32b4e48 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , chardet , django -, django_contrib_comments +, django-contrib-comments , fetchPypi , filebrowser_safe , future @@ -42,7 +42,7 @@ buildPythonPackage rec { bleach chardet django - django_contrib_comments + django-contrib-comments filebrowser_safe future grappelli_safe diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix new file mode 100644 index 00000000000..cd40bb14b1c --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, mkdocs +}: + +buildPythonPackage rec { + pname = "mkdocs-git-authors-plugin"; + version = "0.7.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "timvink"; + repo = "mkdocs-git-authors-plugin"; + rev = "v${version}"; + hash = "sha256-jhYwi9HO6kxOS1QmEKb1YnXGSJ4Eyo4Sm07jI4lxXnA="; + }; + + propagatedBuildInputs = [ mkdocs ]; + + pythonImportsCheck = [ "mkdocs_git_authors_plugin" ]; + + meta = with lib; { + description = "Lightweight MkDocs plugin to display git authors of a markdown page"; + homepage = "https://github.com/timvink/mkdocs-git-authors-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + }; +} diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 152c36848a9..14f4b76b48c 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,16 +38,21 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxpxsP9Gedzo/yrpcz6ZbsC2wQbbk0EuDfhgb3kYZ8g="; + hash = "sha256-+ZKujqnHNQI0S69IxOxEeqnvv6iWW8CQho5hYyNPTrA="; }; + postPatch = '' + substituteInPlace requirements/core-requirements.txt \ + --replace "gunicorn<21" "gunicorn" + ''; + # Remove currently broken dependency `shap`, a model explainability package. # This seems quite unprincipled especially with tests not being enabled, # but not mlflow has a 'skinny' install option which does not require `shap`. diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index b83a6b8a068..c385661738b 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hxXywlDZoQ1DUL/03UngIdlHke8Ey4rDbEV4JKxiGps="; + hash = "sha256-IDu+Yu9BKk4/ITkNY6YLVmJ5zNR6F4LF1vj8QIEW108="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 141caaad192..2623f5c376a 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder # build-system @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.3.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,9 +41,17 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-dfKuIyzgZo5hAZHighpXH78dHJ1PMbyCakyxF34CnMQ="; + hash = "sha256-2PeE/L9J6J0IuUpHZasemM8xxefNJrdzYnutgJjevWQ="; }; + patches = [ + (fetchpatch { + # pytest 7.4 compat + url = "https://github.com/python/mypy/commit/0a020fa73cf5339a80d81c5b44e17116a5c5307e.patch"; + hash = "sha256-3HQPo+V7T8Gr92clXAt5QJUJPmhjnGjQgFq0qR0whfw="; + }) + ]; + nativeBuildInputs = [ mypy-extensions setuptools @@ -108,6 +117,8 @@ buildPythonPackage rec { "mypy/test/testdaemon.py" # fails to find setuptools "mypyc/test/test_commandline.py" + # fails to find hatchling + "mypy/test/testpep561.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 85489d4566e..354a937a610 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -15,15 +15,13 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.7.3"; - - disabled = pythonOlder "3.7"; - + version = "5.9.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SwIfyiTTp0e/TmJmlAM9eS1ZRwWCnl41sU7jNp+fZHc="; + hash = "sha256-On9S0EBjnL2KOJAhjIsP+5MhFYjFdEbJAJXjK6WIG10="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index fae84969a66..d503307ce67 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,14 @@ , runCommand , fetchpatch +, config + # CUDA-only dependencies: , addOpenGLRunpath ? null , cudaPackages ? {} # CUDA flags: -, cudaSupport ? false +, cudaSupport ? config.cudaSupport }: let diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 134dd5c98a3..20019633d8c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -41,14 +41,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.24.2"; + version = "1.25.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-ADqfUw6IDLLNF3y6GvciC5qkLe+cSvwqL8Pua+frKyI="; + hash = "sha256-mjqfOmFIDMCGEXtCaovYaGnCE/xAcuYG8BxOS2brkr8="; }; patches = [ @@ -59,13 +59,6 @@ in buildPythonPackage rec { hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; }) - # Backport from 1.25. `platform.machine` returns `arm64` on aarch64-darwin, which causes - # differing results between `_selected_real_kind_func` and Fortran’s `selected_real_kind`. - (fetchpatch { - url = "https://github.com/numpy/numpy/commit/afcedf4b63f4a94187e6995c2adea0da3bb18e83.patch"; - hash = "sha256-cxBoimX5a9wC2qUIGAo5o/M2E9+eV63bV2/wLmfDYKg="; - }) - # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 445cc705fac..bd0aa88262d 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -4,7 +4,7 @@ , graphviz , graphvizPkgs , isPyPy -, pytestCheckHook +, python , pythonOlder , substituteAll }: @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "3.6.0"; format = "setuptools"; - disabled = pythonOlder "3.5" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchPypi { inherit pname version; @@ -28,27 +28,27 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - graphviz - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; + passthru.optional-dependencies = { + ipython = [ + graphviz + ]; + }; pythonImportsCheck = [ "objgraph" ]; - pytestFlagsArray = [ - "tests.py" - ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} tests.py + runHook postCheck + ''; meta = with lib; { description = "Draws Python object reference graphs with graphviz"; homepage = "https://mg.pov.lt/objgraph/"; changelog = "https://github.com/mgedmin/objgraph/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/omorfi/default.nix b/pkgs/development/python-modules/omorfi/default.nix new file mode 100644 index 00000000000..6bbe964de73 --- /dev/null +++ b/pkgs/development/python-modules/omorfi/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, pkgs +, lib +, stdenv +, hfst +}: + +buildPythonPackage rec { + pname = "omorfi"; + inherit (pkgs.omorfi) src version; + + sourceRoot = "${src.name}/src/python"; + + propagatedBuildInputs = [ + hfst + ]; + + # Fixes some improper import paths + patches = [ ./importfix.patch ]; + + # Apply patch relative to source/src + patchFlags = [ "-p3" ]; + + meta = with lib; { + description = "Python interface for Omorfi"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Ofborg build error (hfst not found?) + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/omorfi/importfix.patch b/pkgs/development/python-modules/omorfi/importfix.patch new file mode 100644 index 00000000000..67a54363c7b --- /dev/null +++ b/pkgs/development/python-modules/omorfi/importfix.patch @@ -0,0 +1,76 @@ +diff --git a/src/python/omorfi/entryguessing/gradation.py b/src/python/omorfi/entryguessing/gradation.py +index 7d3ed8cb..825d7ead 100755 +--- a/src/python/omorfi/entryguessing/gradation.py ++++ b/src/python/omorfi/entryguessing/gradation.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-from .omorfi.error_logging import fail_guess_because +-from .omorfi.string_mangling import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def gradation_make_morphophonemes(wordmap): +diff --git a/src/python/omorfi/entryguessing/guess_new_class.py b/src/python/omorfi/entryguessing/guess_new_class.py +index 1884716b..3a781bfc 100755 +--- a/src/python/omorfi/entryguessing/guess_new_class.py ++++ b/src/python/omorfi/entryguessing/guess_new_class.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-from .error_logging import fail_guess_because +-from .string_manglers import three_syllable ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import three_syllable + + + def guess_new_class(wordmap): +diff --git a/src/python/omorfi/entryguessing/plurale_tantum.py b/src/python/omorfi/entryguessing/plurale_tantum.py +index a8af81fb..95fc4b7b 100755 +--- a/src/python/omorfi/entryguessing/plurale_tantum.py ++++ b/src/python/omorfi/entryguessing/plurale_tantum.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-from .error_logging import fail_guess_because +-from .omorfi.string_manglers import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def plurale_tantum_get_singular_stem(wordmap): +diff --git a/src/python/omorfi/formats/experimental_xml_formatter.py b/src/python/omorfi/formats/experimental_xml_formatter.py +index abccbff5..11b0f518 100755 +--- a/src/python/omorfi/formats/experimental_xml_formatter.py ++++ b/src/python/omorfi/formats/experimental_xml_formatter.py +@@ -19,9 +19,9 @@ + + from xml.sax.saxutils import escape as xml_escape + +-from ftb3_formatter import Ftb3Formatter ++from .ftb3_formatter import Ftb3Formatter + +-from .settings import version_id_easter_egg ++from omorfi.settings import version_id_easter_egg + + + def make_xmlid(s): +diff --git a/src/python/omorfi/formats/lexc_formatter.py b/src/python/omorfi/formats/lexc_formatter.py +index 4ec616b7..b146129f 100755 +--- a/src/python/omorfi/formats/lexc_formatter.py ++++ b/src/python/omorfi/formats/lexc_formatter.py +@@ -19,8 +19,8 @@ + + # functions for formatting the database data to lexc + +-from .settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary +-from .string_manglers import lexc_escape ++from omorfi.settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary ++from omorfi.string_manglers import lexc_escape + + + def format_copyright_lexc(): diff --git a/pkgs/development/python-modules/onnxmltools/default.nix b/pkgs/development/python-modules/onnxmltools/default.nix new file mode 100644 index 00000000000..97eaf68254b --- /dev/null +++ b/pkgs/development/python-modules/onnxmltools/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, onnx +, skl2onnx +# native check inputs +, pytestCheckHook +, pandas +, xgboost +, onnxruntime +, scikit-learn +, pyspark +, lightgbm +}: + +buildPythonPackage rec { + pname = "onnxmltools"; + version = "1.11.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "onnx"; + repo = "onnxmltools"; + rev = "v${version}"; + hash = "sha256-uLFAGtCDLdMd0SMoonMXFE0kGHuDpwp6IrIbD0t8l4M="; + }; + + propagatedBuildInputs = [ + numpy + onnx + skl2onnx + ]; + + pythonImportsCheck = [ "onnxmltools" ]; + + # there are still some dependencies that need to be packaged for the tests to run + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pandas + xgboost + onnxruntime + scikit-learn + pyspark + lightgbm + # coremltools + # libsvm + # h20 + ]; + + meta = with lib; { + description = "ONNXMLTools enables conversion of models to ONNX"; + homepage = "https://github.com/onnx/onnxmltools"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 19b3e9cc3e7..39074543b42 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -1,23 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system , poetry-core -, pytestCheckHook -, isodate + +# propagates , jsonschema +, jsonschema-specifications , rfc3339-validator + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.4.4"; + version = "0.6.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2XTCdp9dfzhNKCpq71pt7yEZm9abiEmFHD/114W+jOQ="; + hash = "sha256-859v6KqIRfUq4d/KbkvGnGqlxz6BXTl+tKQHPhtkTH0="; }; postPatch = '' @@ -30,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema + jsonschema-specifications rfc3339-validator ]; @@ -40,6 +50,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { + changelog = "https://github.com/python-openapi/openapi-schema-validator/releases/tag/${version}"; description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0"; homepage = "https://github.com/p1c2u/openapi-schema-validator"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 5bcbca949fd..847a9fdcbdd 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub + +# build-system , poetry-core # propagates @@ -10,31 +12,30 @@ , jsonschema-spec , lazy-object-proxy , openapi-schema-validator -, pyyaml - -# optional -, requests # tests -, mock , pytestCheckHook }: buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.5.6"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # no tests via pypi sdist src = fetchFromGitHub { owner = "p1c2u"; - repo = pname; + repo = "openapi-spec-validator"; rev = "refs/tags/${version}"; - hash = "sha256-BIGHaZhrEc7wcIesBIXdVRzozllCNOz67V+LmQfZ8oY="; + hash = "sha256-sGr4dH6Twyi4OeCAXZiboN75dYZ6wJ0pWMzV9zOfee0="; }; + postPatch = '' + sed -i '/--cov/d' pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; @@ -48,14 +49,6 @@ buildPythonPackage rec { importlib-resources ]; - passthru.optional-dependencies.requests = [ - requests - ]; - - preCheck = '' - sed -i '/--cov/d' pyproject.toml - ''; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 72578e1825a..9950b6af162 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; - rev = "v${version}"; - hash = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; + rev = "refs/tags/v${version}"; + hash = "sha256-uLfewj7M8KNs3oL1AM18sR/WhAR2mvBfqadyhR73FP0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix new file mode 100644 index 00000000000..379b5a608ae --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, wrapt +, pytestCheckHook +, aiohttp +}: +let + pname = "opentelemetry-instrumentation-aiohttp-client"; + version = "0.39b0"; +in +buildPythonPackage { + inherit pname version; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-python-contrib"; + rev = "refs/tags/v${version}"; + hash = "sha256-HFDebR3d1osFAIlNuIbs5s+uPeTTJ1xkz+BpE5BpciU="; + sparseCheckout = [ "/instrumentation/${pname}" ]; + } + "/instrumentation/${pname}"; + + format = "pyproject"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + opentelemetry-util-http + wrapt + aiohttp + ]; + + # missing https://github.com/ezequielramos/http-server-mock + # which looks unmaintained + doCheck = false; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ]; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + description = "OpenTelemetry Instrumentation for aiohttp-client"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix new file mode 100644 index 00000000000..abeed7f0588 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-sdk +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, wrapt +, pytestCheckHook +, grpcio +}: + +buildPythonPackage rec { + pname = "opentelemetry-instrumentation-grpc"; + version = "0.39b0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-python-contrib"; + rev = "refs/tags/v${version}"; + hash = "sha256-DkDAE0MsF9HdywxlFzqJaqNor4O/jpnSqINsKTuiVqU="; + sparseCheckout = [ "/instrumentation/${pname}" ]; + } + "/instrumentation/${pname}"; + + format = "pyproject"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-sdk + opentelemetry-semantic-conventions + wrapt + ]; + + passthru.optional-dependencies = { + instruments = [ grpcio ]; + }; + + nativeCheckInputs = [ + opentelemetry-test-utils + grpcio + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; + description = "OpenTelemetry Instrumentation for grpc"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 26342ab42db..37553cf69ea 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.14"; + version = "0.0.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-eTlFb/v88jaEzx5H8ofHMNkqPunDvXcXGvg5ThripeA="; + hash = "sha256-hSwKdxtWgxJCdKk9tw7iCBC7I4buxbRfx4GRwyym6rg="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index cd30ec18152..b693afc4771 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "optax"; - version = "0.1.5"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vhPpynKq0dboSt+fQ4lvVv9ytDXnZKRrc7lF03Mm39g="; + hash = "sha256-zSMJxagPe2rkhrawJ+TWXUzk6V58IY6MhWmEqLVtOoA="; }; outputs = [ diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index aa646a08ee9..7d89f5778c7 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -3,6 +3,7 @@ , fetchPypi , fixtures , pbr +, six , subunit , callPackage }: @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "oslotest"; version = "4.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -20,6 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fixtures + six subunit ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d74c63b1030..0c3b28d1d21 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -2,114 +2,218 @@ , stdenv , buildPythonPackage , fetchPypi -, python , pythonOlder + +# build-system , cython +, setuptools +, versioneer + +# propagates , numpy , python-dateutil , pytz -# Test inputs +, tzdata + +# optionals +, beautifulsoup4 +, bottleneck +, blosc2 +, brotlipy +, fsspec +, gcsfs +, html5lib +, jinja2 +, lxml +, matplotlib +, numba +, numexpr +, odfpy +, openpyxl +, psycopg2 +, pyarrow +, pymysql +, pyqt5 +, pyreadstat +, python-snappy +, qtpy +, s3fs +, scipy +, sqlalchemy +, tables +, tabulate +, xarray +, xlrd +, xlsxwriter +, zstandard + +# tests +, adv_cmds +, glibc , glibcLocales , hypothesis -, jinja2 , pytestCheckHook , pytest-xdist , pytest-asyncio -, xlsxwriter -# Darwin inputs +, python , runtimeShell -, libcxx }: buildPythonPackage rec { pname = "pandas"; - version = "1.5.3"; - format = "setuptools"; + version = "2.0.3"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-dKP9flp+wFLxgyc9x7Cs06hj7fdSD106F2XAT/2zsLE="; + hash = "sha256-wC83Kojg0X820wk6ZExzz8F4jodqfEvLQCCndRLiBDw="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + setuptools + cython + numpy + versioneer + ] ++ versioneer.optional-dependencies.toml; - buildInputs = lib.optional stdenv.isDarwin libcxx; + enableParallelBuilding = true; propagatedBuildInputs = [ numpy python-dateutil pytz + tzdata ]; + passthru.optional-dependencies = let + extras = { + aws = [ + s3fs + ]; + clipboard = [ + pyqt5 + qtpy + ]; + compression = [ + brotlipy + python-snappy + zstandard + ]; + computation = [ + scipy + xarray + ]; + excel = [ + odfpy + openpyxl + # TODO: pyxlsb + xlrd + xlsxwriter + ]; + feather = [ + pyarrow + ]; + fss = [ + fsspec + ]; + gcp = [ + gcsfs + # TODO: pandas-gqb + ]; + hdf5 = [ + blosc2 + tables + ]; + html = [ + beautifulsoup4 + html5lib + lxml + ]; + mysql = [ + sqlalchemy + pymysql + ]; + output_formatting = [ + jinja2 + tabulate + ]; + parquet = [ + pyarrow + ]; + performance = [ + bottleneck + numba + numexpr + ]; + plot = [ + matplotlib + ]; + postgresql = [ + sqlalchemy + psycopg2 + ]; + spss = [ + pyreadstat + ]; + sql-other = [ + sqlalchemy + ]; + xml = [ + lxml + ]; + }; + in extras // { + all = lib.concatLists (lib.attrValues extras); + }; + + # Doesn't work with -Werror,-Wunused-command-line-argument + # https://github.com/NixOS/nixpkgs/issues/39687 + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; + nativeCheckInputs = [ glibcLocales hypothesis - jinja2 pytest-asyncio pytest-xdist pytestCheckHook - xlsxwriter + ] ++ lib.optionals (stdenv.isLinux) [ + # for locale executable + glibc + ] ++ lib.optionals (stdenv.isDarwin) [ + # for locale executable + adv_cmds ]; - # Doesn't work with -Werror,-Wunused-command-line-argument - # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture - # don't max out build cores, it breaks tests dontUsePytestXdist = true; + __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh "--skip-db" "--skip-slow" "--skip-network" - "-m" "'not single_cpu'" + "-m" "'not single_cpu and not slow_arm'" "--numprocesses" "4" ]; disabledTests = [ - # Locale-related - "test_names" - "test_dt_accessor_datetime_name_accessors" - "test_datetime_name_accessors" - # Disable IO related tests because IO data is no longer distributed - "io" - # Tries to import from pandas.tests post install - "util_in_top_level" - # Tries to import compiled C extension locally - "test_missing_required_dependency" - # AssertionError with 1.2.3 - "test_from_coo" - # AssertionError: No common DType exists for the given inputs - "test_comparison_invalid" - # AssertionError: Regex pattern '"quotechar" must be string, not int' - "python-kwargs2" - # Tests for rounding errors and fails if we have better precision - # than expected, e.g. on amd64 with FMA or on arm64 - # https://github.com/pandas-dev/pandas/issues/38921 - "test_rolling_var_numerical_issues" - # Requires mathplotlib - "test_subset_for_boolean_cols" - # DeprecationWarning from numpy - "test_sort_values_sparse_no_warning" - ] ++ lib.optionals stdenv.isDarwin [ - "test_locale" - "test_clipboard" - # ValueError: cannot reindex on an axis with duplicate labels - # - # Attempts to reproduce this problem outside of Hydra failed. - "test_reindex_timestamp_with_fold" + # AssertionError: Did not see expected warning of class 'FutureWarning' + "test_parsing_tzlocal_deprecated" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} + "test_binops" ]; # Tests have relative paths, and need to reference compiled C extensions # so change directory where `import .test` is able to be resolved preCheck = '' - cd $out/${python.sitePackages}/pandas + export HOME=$TMPDIR export LC_ALL="en_US.UTF-8" - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + cd $out/${python.sitePackages}/pandas '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. @@ -121,19 +225,24 @@ buildPythonPackage rec { export PATH=$(pwd):$PATH ''; - enableParallelBuilding = true; - - pythonImportsCheck = [ "pandas" ]; + pythonImportsCheck = [ + "pandas" + ]; meta = with lib; { # https://github.com/pandas-dev/pandas/issues/14866 # pandas devs are no longer testing i686 so safer to assume it's broken broken = stdenv.isi686; - homepage = "https://pandas.pydata.org/"; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; - description = "Python Data Analysis Library"; + description = "Powerful data structures for data analysis, time series, and statistics"; + downloadPage = "https://github.com/pandas-dev/pandas"; + homepage = "https://pandas.pydata.org"; license = licenses.bsd3; + longDescription = '' + Flexible and powerful data analysis / manipulation library for + Python, providing labeled data structures similar to R data.frame + objects, statistical functions, and much more. + ''; maintainers = with maintainers; [ raskin fridh knedlsepp ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index eb1d1f3df3a..96f626b24b6 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.1"; + version = "2.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-g8VL5nO180XplMgbbeeJIp6lmbWcMKdY/IftlkL6e5U="; + hash = "sha256-46HTamiy+8fiGVeviYqXsjwu+PEBE38y19cBVRc+zm0="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index f07e3ca82fa..be5573a0055 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.1.2"; + version = "1.1.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1PpzWmRffpWmvrNKK19+jgDZPdBDnXPzHMguQLW4/c4="; + hash = "sha256-f0kSHnC0Lcopb6yWIhDdLaB6OVdfxWcxN61mFjOyzz8="; }; preCheck = '' diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index e78d9e8609c..eebea069de0 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.0.1"; + version = "19.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i7jW9hby6rgM/lWpujn+mRif2KhIu1mmJw3AnrofCVU="; + hash = "sha256-Ju+vKKNmRCRLYSOXNmCdBR8Ce1Xw3BA7IMMCRBSFhKQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 5c2fd231465..66d7cf680bf 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , hypothesis , pythonOlder -, importlib-metadata , jbig2dec , deprecation , lxml @@ -19,14 +18,13 @@ , python-xmp-toolkit , qpdf , setuptools -, setuptools-scm , substituteAll , wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "7.2.0"; + version = "8.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-acGIhIWC1nUQiN0iwb1kLKxz+ytIqYIW4VXF45Tx50g="; + hash = "sha256-8uPPEoLxoMRq/tkpThatwjPHZIMYQ8lNL6fLcG+nsnw="; }; patches = [ @@ -57,8 +55,6 @@ buildPythonPackage rec { --replace "shims_enabled = not cflags_defined" "shims_enabled = False" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ qpdf ]; @@ -66,7 +62,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools - setuptools-scm wheel ]; @@ -85,8 +80,6 @@ buildPythonPackage rec { lxml packaging pillow - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; pythonImportsCheck = [ "pikepdf" ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index b3ff63b1fb9..f1489e1f458 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -13,25 +13,17 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.5.0"; - format = "setuptools"; + version = "10.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE="; + hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; }; - patches = [ - (fetchpatch { - # Fixed type handling for include and lib directories; Remove with 10.0.0 - url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch"; - hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 2259ecf655d..9252a2a5fbe 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -2,10 +2,15 @@ , buildPythonPackage , fetchPypi , pythonOlder + +# build-system +, setuptools , setuptools-scm -, importlib-metadata -, packaging -# Check Inputs + +# propagates +, typing-extensions + +# tests , pytestCheckHook , pytest-subtests , numpy @@ -15,20 +20,25 @@ buildPythonPackage rec { pname = "pint"; - version = "0.20.1"; + version = "0.22"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Pint"; - hash = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; + hash = "sha256-LROfarvPMBbK19POwFcH/pCKxPmc9Zrt/W7mZ7emRDM="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ packaging ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ + typing-extensions + ]; nativeCheckInputs = [ pytestCheckHook @@ -38,13 +48,17 @@ buildPythonPackage rec { uncertainties ]; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$(mktemp -d) ''; + disabledTests = [ + # https://github.com/hgrecco/pint/issues/1825 + "test_equal_zero_nan_NP" + ]; + meta = with lib; { + changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES"; description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 9d2deb68d44..f64a76d3e62 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.5.1"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/qi22jiF+P7XcG/D+dxoOrHk89amdBoGewrTqZZOsoM="; + hash = "sha256-gBiXdnBWp0SlpE6TQPONTXEsQ2XFGCANGdNM/gv7V5s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index eeb445a9a9a..1c64471778a 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.34.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-GIxMVuSSJsRDsHDOPnJsDsTcghGYtIFpRS5u7HJd+zY="; + hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc="; }; patches = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 46aebb51950..e6473e98a28 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,31 +1,40 @@ { buildPythonPackage , lib -, fetchPypi +, fetchFromGitHub , setuptools-scm , pythonOlder , importlib-metadata +, callPackage }: buildPythonPackage rec { pname = "pluggy"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pluggy"; + rev = "refs/tags/${version}"; + hash = "sha256-SzJu7ITdmUgusn8sz6fRBpxTMQncWIViP5NCAj4q4GM="; }; nativeBuildInputs = [ setuptools-scm ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # To prevent infinite recursion with pytest doCheck = false; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = { + changelog = "https://github.com/pytest-dev/pluggy/blob/${src.rev}/CHANGELOG.rst"; description = "Plugin and hook calling mechanisms for Python"; homepage = "https://github.com/pytest-dev/pluggy"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pluggy/tests.nix b/pkgs/development/python-modules/pluggy/tests.nix new file mode 100644 index 00000000000..dc6e16e7b2d --- /dev/null +++ b/pkgs/development/python-modules/pluggy/tests.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage +, pluggy +, pytestCheckHook +}: + +buildPythonPackage { + pname = "pluggy-tests"; + inherit (pluggy) version; + format = "other"; + + inherit (pluggy) src; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + pluggy + pytestCheckHook + ]; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 72c9b087bf6..4cd07a0249d 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.31.7"; + version = "0.31.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-gtXRVXwh6yXbIrcoe6OaBs4aTXJF2sdw/V8VBIsB97k="; + hash = "sha256-glC/2bpjw0SKE6EezWLk9a4otBU21JSxsbIE5/LBGnY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index daf45528202..270c78a6982 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -11,7 +11,6 @@ , pytest-mock , pytestCheckHook , setuptools -, tomlkit , virtualenv }: @@ -54,7 +53,6 @@ buildPythonPackage rec { pytest-mock pytestCheckHook setuptools - tomlkit virtualenv ]; diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index fe42888d61f..7dd625b83c6 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.1.20230703"; + version = "1.5.1.20230725"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wn/ctnvn7SxB79Jlg+Eqsk3y8bHYKMi4+NE4Rr0E4N4="; + hash = "sha256-N0yQSVgSYx2D5wpixBMrxPq8ddKcGr/vfnsGn+Smrac="; }; # Tests are not shipped and there are no GitHub tags diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 572e1efceb6..1fffa8cde71 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "prance"; - version = "0.22.02.22.0"; + version = "23.06.21.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-NtIbZp34IcMYJzaNQVL9GLdNS3NYOCRoWS1wGg/gLVA="; + hash = "sha256-p+LZbQal4DPeMp+eJ2O83rCaL+QIUDcU34pZhYdN4bE="; }; postPatch = '' @@ -70,6 +70,7 @@ buildPythonPackage rec { "test_convert_defaults" "test_convert_output" "test_fetch_url_http" + "test_openapi_spec_validator_validate_failure" ]; pythonImportsCheck = [ "prance" ]; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index e85e4116ba5..eb71f167b74 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-7FYIRlr75L0y1d9jgbPpq/G7VC4YMD7IUQVNhfHdCh8="; + hash = "sha256-CVpXw5yAYBeRgTlNzgourQlDqfNmKLdzV7mQSd7PoJg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index ef112d3bb61..7ba24e4bd52 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -24,13 +24,13 @@ } ./setup-hook.sh; in buildPythonPackage rec { pname = "pybind11"; - version = "2.10.4"; + version = "2.11.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-n7nLEG2+sSR9wnxM+C8FWc2B+Mx74Pan1+IQf+h2bGU="; + hash = "sha256-sO/Fa+QrAKyq2EYyYMcjPrYI+bdJIrDoj6L3JHoDo3E="; }; postPatch = '' @@ -87,7 +87,7 @@ in buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ + disabledTests = lib.optionals stdenv.isDarwin [ # expects KeyError, gets RuntimeError # https://github.com/pybind/pybind11/issues/4243 "test_cross_module_exception_translator" diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index f07c8062c10..47e90eb8726 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,14 +10,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.17.0"; + version = "3.18.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; - rev = "v${version}"; - hash = "sha256-xsfd+dbaNOPuD0ulvpLPBPtcFgmJqX1VuunwNMcqh+Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-6oXXy18KlSjfyZhfMnIgnu34u/9sG0TPYvPJ8ovTqMA="; }; postPatch = '' @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Self-contained cryptographic library"; homepage = "https://github.com/Legrandin/pycryptodome"; + changelog = "https://github.com/Legrandin/pycryptodome/blob/v${version}/Changelog.rst"; license = with licenses; [ bsd2 /* and */ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index c86c7b376c6..faa85f6f4a8 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.12"; + version = "1.12.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-upqlLEGxetkFiwHuwwf7c2wbqrXQcRSamRszYUTsyNk="; + hash = "sha256-n4FmMqpCqxPmGJokfaxnruG9d5oodv6Yfg80Y1EIr34="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 152e9463b0e..63570716030 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pygments_better_html"; - version = "0.1.4"; + version = "0.1.5"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "028szd3k295yhz943bj19i4kx6f0pfh1fd2q14id0g84dl4i49dm"; + sha256 = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index a7b2acd55ca..8f32d26ebc2 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, docutils -, lxml + +# build-system +, setuptools + +# tests , pytestCheckHook , wcag-contrast-ratio }: @@ -10,22 +13,23 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.14.0"; + version = "2.15.1"; + format = "pyproject"; src = fetchPypi { pname = "Pygments"; inherit version; - hash = "sha256-s+0GqeismpquWm9dvniopYZV0XtDuTwHjwlN3Edq4pc="; + hash = "sha256-is5NPB3UgYlLIAX1YOrQ+fGe5k/pgzZr4aIeFx0Sd1w="; }; - propagatedBuildInputs = [ - docutils + nativeBuildInputs = [ + setuptools ]; # circular dependencies if enabled by default doCheck = false; + nativeCheckInputs = [ - lxml pytestCheckHook wcag-contrast-ratio ]; @@ -35,13 +39,16 @@ let pygments = buildPythonPackage "tests/examplefiles/bash/ltmain.sh" ]; - pythonImportsCheck = [ "pygments" ]; + pythonImportsCheck = [ + "pygments" + ]; passthru.tests = { check = pygments.overridePythonAttrs (_: { doCheck = true; }); }; meta = with lib; { + changelog = "https://github.com/pygments/pygments/releases/tag/${version}"; homepage = "https://pygments.org/"; description = "A generic syntax highlighter"; mainProgram = "pygmentize"; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 55e682e0741..cef52b754ad 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.7.0"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - hash = "sha256-vWyko8QoXBotQ0nloDX9+PuU4EzND8vmuiidrpzD4HQ="; + hash = "sha256-V+KNFW49XBAIjgxoq7kL+sPfgrQKcb0NqiDGXM1cI94="; }; postPatch = '' @@ -45,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ (lib.flatten (lib.attrValues passthru.optional-dependencies)); + disabledTests = [ + # requires internet connection + "test_get_jwt_set_sslcontext_default" + ]; + pythonImportsCheck = [ "jwt" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 7ce16743125..a3e7184f715 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.16.2"; + version = "2.17.5"; format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - hash = "sha256-xNCGf4CsxEKScIn6dl2Ka31P6bhMo5fTs9TIQz+vPiM="; + hash = "sha256-cmH6Q6/XJXx8EXDIsik1Aheu9hYGvvlNvWBUCdmC3P8="; }; nativeBuildInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { # implementation relies on the '__implements__' attribute proposed # in PEP 245, which was rejected in 2006. "-W" "ignore::DeprecationWarning" + "-v" ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index db77f854dbb..4e67fd0783d 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "23.1.1"; + version = "23.2.0"; format = "setuptools"; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - hash = "sha256-hBSYub7GFiOxtsR+u8AjZ8B9YODhlfGXkIF/EMyNsLc="; + hash = "sha256-J2+TH1WkUufeppxxc+mE6ypEB85BPJGKo0tV+C+bi6w="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix index c7abf88c3da..a1df192ac22 100644 --- a/pkgs/development/python-modules/pyopnsense/default.nix +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -4,10 +4,10 @@ , fixtures , mock , pbr -, pytest-cov , pytestCheckHook , pythonOlder , requests +, testtools }: buildPythonPackage rec { @@ -29,8 +29,8 @@ buildPythonPackage rec { nativeCheckInputs = [ fixtures mock - pytest-cov pytestCheckHook + testtools ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pypitoken/default.nix b/pkgs/development/python-modules/pypitoken/default.nix index 90c42306a13..816afc262f9 100644 --- a/pkgs/development/python-modules/pypitoken/default.nix +++ b/pkgs/development/python-modules/pypitoken/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pypitoken"; - version = "6.0.3"; + version = "7.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ewjoachim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1kPIVcxpFjqlAnPh71iS07n9M0qcFrwMRV8k38YxHBc="; + hash = "sha256-CjSENkk1VlzrCngwFoJuq31Iai60qTJXBGMoV5QkSsE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index a913923b2ce..67a57b8c203 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G/mmM2lEQWJV+7uZHKECj1jnhTYbcOw9yCi4/9nRDuk="; + hash = "sha256-Qi0NfLayypi/wKJZB9IOzoeaZsb3oq2JahXWdkwSjeo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index e9848a3ad82..52649fed671 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "23.2.1"; + version = "23.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "pyslurm"; owner = "PySlurm"; rev = "refs/tags/v${version}"; - hash = "sha256-EYXVkQGe5A+fmzcBdhMnALzX8k7hxaCYsL1Ehrikme4="; + hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU="; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index e13f67ec83b..96179595a9a 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.20.3"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oq28wJ/Tq4yuQ/98tdzYKDyatpliS0Xcbc6T46ZTP7I="; + hash = "sha256-Wpo8MpCPGiXrckT2x5/yBYtGlzso/L2urG7yGc7SPkA="; }; outputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; - changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/docs/source/reference/changelog.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-asyncio/tests.nix b/pkgs/development/python-modules/pytest-asyncio/tests.nix index 94e6e1855af..7fd26c85488 100644 --- a/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -10,6 +10,8 @@ buildPythonPackage { pname = "pytest-asyncio-tests"; inherit (pytest-asyncio) version; + format = "other"; + src = pytest-asyncio.testout; dontBuild = true; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index dd93d6bac25..7df529a8373 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; + hash = "sha256-OQSxPfv+xH8AO453/VtYnNEZBKId3xqzimTyBNahDvY="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 3d68c2dccc4..1d03413290a 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-17L1Jz7G0eIhdXmYvC9Q0kdO19C5MxuSVWAR+txOmr8="; + hash = "sha256-uu2bO2uud711uSOODtHuaQOkKAaunWrv+4dUzVWE1P8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 77290573dc1..efde539cb23 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -1,42 +1,59 @@ { lib , buildPythonPackage -, factory_boy , fetchFromGitHub -, inflection -, mock + +# build-system +, poetry-core + +# unpropagated , pytest -, pytestcache + +# propagated +, inflection +, factory_boy +, typing-extensions + +# tests , pytestCheckHook -, pytest-cov }: buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.1.0"; + version = "2.5.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p"; + sha256 = "sha256-zxgezo2PRBKs0mps0qdKWtBygunzlaxg8s9BoBaU1Ig="; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ factory_boy inflection + typing-extensions + ]; + + pythonImportsCheck = [ + "pytest_factoryboy" ]; nativeCheckInputs = [ - mock pytestCheckHook - pytestcache - pytest-cov ]; - pytestFlagsArray = [ "--ignore=docs" ]; - pythonImportsCheck = [ "pytest_factoryboy" ]; + pytestFlagsArray = [ + "--ignore=docs" + ]; meta = with lib; { description = "Integration of factory_boy into the pytest runner"; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index feae8490130..01ef1025904 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LY5Ur0cIcsNrgvyQlY2E479ZzRcuwqTuiT2MtRupVcs="; + hash = "sha256-bjysG+7niSUBl8YMWR8pr7oOz9GDbSfq3PeloYBkq3s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index bb0d410618e..89b035e74d8 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-muQ8lb00tdhAvaLaNupuHh6YqbDEvkaGFbnb4tR2Wes="; + hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 7d1ec8696c2..7b4a285e355 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage , fetchPypi -, poetry-core +, hatch-vcs +, hatchling , pytest , pytestCheckHook , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; - version = "2.0.4"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_metadata"; inherit version; - hash = "sha256-/MZT9l/jA1tHiCC1KE+/D1KANiLuP2Ci+u16fTuh9B4="; + hash = "sha256-dpqcZdKIS9WDvGJrCs53rRXb4C3ZGpEG1H/UbZwlaco="; }; nativeBuildInputs = [ - poetry-core - setuptools-scm + hatchling + hatch-vcs ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 7dc15e3cd27..260c71ac71f 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.10.0"; + version = "3.11.1"; disabled = pythonOlder "3.7"; @@ -19,17 +19,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-+72whe98JSoyb9jNysCqOxMz2IEfExvcxwEALhvn7U8="; + hash = "sha256-f2sSVgKsbXQ+Ujrgv6ceGml6L1U0BkUoxv+EwvfC/H8="; }; - patches = [ - (fetchpatch { - # Remove unnecessary py.code import - url = "https://github.com/pytest-dev/pytest-mock/pull/328/commits/e2016928db1147a2a46de6ee9fa878ca0e9d8fc8.patch"; - hash = "sha256-5Gpzi7h7Io1CMykmBCZR/upM8E9isc3jEItYgwjEOWA="; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index 7e05104ff63..7c723e4cdc2 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -8,22 +8,27 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.12.0"; - format = "setuptools"; + version = "3.13.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { repo = pname; owner = "pytest-dev"; rev = version; - hash = "sha256-n/Xp/HghqcQUreez+QbR3Mi5hE1U4zoOJCdFqD+pVBk="; + hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -47,6 +52,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/pytest-dev/pytest-randomly/blob/${version}/CHANGELOG.rst"; description = "Pytest plugin to randomly order tests and control random.seed"; homepage = "https://github.com/pytest-dev/pytest-randomly"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index a0aac8a9d08..f030960df65 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "11.1.2"; + version = "12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VWEWYehz8cr6OEyC8I0HiDlU9LdkNfS4pbRwwZVFc94="; + hash = "sha256-eE9GL6h/6b33gdACfYVrR6S/5sEq8Qj2vYhwV6kXtI4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 0da33a77006..b391ece3556 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -3,22 +3,24 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2ZYaZ8F5HoweMtznpw7R5U87HmQQh/IJTy03CHq3+xc="; + hash = "sha256-UYZciEV1RfUftyARlC8KPGkB7p4ky/ttG53BNIuvvjc="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 61f12a792d9..5c260f43216 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "3.2.1"; + version = "3.3.1"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GEm9mNiyQrlI5HLbdHjgkL8zYZEqj+2HmS7ZQIX1Ryc="; + hash = "sha256-1e4FIOsbe8ylCmClGKt6dweZKBLFeBmPi0T9+seOjJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 80ea02356cd..5fde855e58e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.2.1"; + version = "7.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1F4JUvNyckGRi4/Q83b1/2swHMB3fG+aVWk1yS2KfUI="; + hash = "sha256-tL+MRb1Zk07YQAGtUeEbTuQNQKEinSx5+cWSsKP2vYo="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 503723aa962..e2daf959abb 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.31.0"; + version = "0.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fFxFpVKA6CdKwYRQCZb7iDrhLVmzaCr009Cv7CvMDyo="; + hash = "sha256-4fBV7sInw/jrKt7CmG7riMTmpLyrsyvWZGRY6s3YbHw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 74a0d8deb09..389e8a5df98 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jozMYrmXHSykv5npboyySuVDs1Lamlee15ZPYI4zmO4="; + hash = "sha256-oLqgjTuC5rpAzXTJO+KFn+uQ0TV7rNPWHOAJtRI4otk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 8c51d9942f6..1d79ad756ea 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,33 +1,40 @@ { lib , stdenv -, buildPythonPackage -, fetchPypi -, pythonOlder -, pythonAtLeast -, pkg-config -, alsa-lib -, libjack2 -, tox -, flake8 , alabaster +, alsa-lib +, buildPythonPackage , CoreAudio , CoreMIDI , CoreServices +, fetchPypi +, flake8 +, libjack2 +, meson-python +, pkg-config +, pythonOlder +, setuptools +, tox }: buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.9"; + version = "1.5.4"; + format = "pyproject"; - # https://github.com/SpotlightKid/python-rtmidi/issues/115 - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "bfeb4ed99d0cccf6fa2837566907652ded7adc1c03b69f2160c9de4082301302"; + pname = "python_rtmidi"; + inherit version; + hash = "sha256-sLUGQoDba3iiYvqUFwMbIktSdZBb0OLhccfQ++FFRP0="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + meson-python + pkg-config + setuptools + ]; + buildInputs = [ libjack2 ] ++ lib.optionals stdenv.isLinux [ @@ -37,15 +44,21 @@ buildPythonPackage rec { CoreMIDI CoreServices ]; + nativeCheckInputs = [ tox flake8 alabaster ]; + pythonImportsCheck = [ + "rtmidi" + ]; + meta = with lib; { description = "A Python binding for the RtMidi C++ library implemented using Cython"; homepage = "https://github.com/SpotlightKid/python-rtmidi"; + changelog = "https://github.com/SpotlightKid/python-rtmidi/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index ef03e769476..7a55b2003ab 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -19,13 +19,13 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.11.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - hash = "sha256-F9gUZOTSuiqvfGoN4yQqwUg9mnCeBntw5eHO7ZnjpzI="; + hash = "sha256-baDrReJgQXbaKA8KNhHiFjr0X34yb8WK/nUJmiM9EZs="; }; patches = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 8e5b66171ae..d4067edd338 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-sjRJzov7P8B0kg7+T+JKCpx6TsaOr1N3TYIeKayI0+8="; + hash = "sha256-/RfHryuIFhLn9SCg6YVn0Ley8ajcIlsDtuKNuhUFm8M="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index e2c02fcc559..e9ec506d6d4 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.10.5"; + version = "4.10.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BrdffDuPTn/uFKT9F0pF1+0/MraIPRwsN64DdseQdQA="; + hash = "sha256-vO60QMr+J3tE7ZIU7fZP27jMuPeCJH56Hbhjek5ZfXI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 9b1d8424faf..26af176ec47 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gDkt+6fuQ3kHfjgy3VqYGZNM9mGyJdbkt6QzNpVHzYQ="; + hash = "sha256-UbaaudnwsIXs/IsiZyCamnWjLndwrn244ZdbvZa7P0I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 2a681c4f496..f35c6a028d1 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.15"; + version = "0.4.16"; src = fetchPypi { inherit pname version; - hash = "sha256-vz7Sjd8KT7UgOBI5AN5q6CS7jl+WL87w91cgm0bXRGw="; + hash = "sha256-qqcMhwsKs2UhX45xUF9zaDxO0VsfNjhDOx3HNE/ltd0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 7c19e55a7f7..a7270958387 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -3,24 +3,30 @@ , pythonOlder , fetchFromGitHub , cython +, setuptools , libyaml , python }: buildPythonPackage rec { pname = "pyyaml"; - version = "6.0"; + version = "6.0.1"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "yaml"; repo = "pyyaml"; rev = version; - hash = "sha256-wcII32mRgRRmAgojntyxBMQkjvxU2jylCgVzlHAj2Xc="; + hash = "sha256-YjWMyMVDByLsN5vEecaYjHpR1sbBey1L/khn4oH9SPA="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + setuptools + ]; buildInputs = [ libyaml ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 519eb31a5b1..57b16e254fc 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -4,6 +4,7 @@ , ipykernel , jupyter-core , jupyter-client +, ipython_genutils , pygments , pyqt5 , pytestCheckHook @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel + ipython_genutils jupyter-core jupyter-client pygments diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index aaf6e77c030..287104e5b78 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.0.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-rpUrMHIBr7sb0Cib6WYdLJ3KOPEgRnB0DCV/df1uE1A="; + hash = "sha256-nmPOYiozt5mDvFmEkRTIblECcGjV5650wZGGq+iSMPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index f6ccd201df9..37e418f3ea4 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -9,56 +9,59 @@ , pytestCheckHook , pythonOlder , rpds-py -, setuptools-scm }: -buildPythonPackage rec { - pname = "referencing"; - version = "0.30.0"; - format = "pyproject"; - disabled = pythonOlder "3.7"; +let + self = buildPythonPackage rec { + pname = "referencing"; + version = "0.30.0"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "python-jsonschema"; - repo = "referencing"; - rev = "refs/tags/v${version}"; - fetchSubmodules = true; - hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; - }; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-jsonschema"; + repo = "referencing"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; - postPatch = '' - sed -i "/Topic/d" pyproject.toml - ''; + propagatedBuildInputs = [ + attrs + rpds-py + ]; - nativeBuildInputs = [ - hatch-vcs - hatchling - setuptools-scm - ]; + nativeCheckInputs = [ + jsonschema + pytest-subtests + pytestCheckHook + ]; - propagatedBuildInputs = [ - attrs - rpds-py - ]; + # avoid infinite recursion with jsonschema + doCheck = false; - nativeCheckInputs = [ - jsonschema - pytest-subtests - pytestCheckHook - ]; + passthru.tests.referencing = self.overridePythonAttrs { doCheck = true; }; - pythonImportsCheck = [ - "referencing" - ]; + pythonImportsCheck = [ + "referencing" + ]; - meta = with lib; { - description = "Cross-specification JSON referencing"; - homepage = "https://github.com/python-jsonschema/referencing"; - changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + meta = with lib; { + description = "Cross-specification JSON referencing"; + homepage = "https://github.com/python-jsonschema/referencing"; + changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/repath/default.nix b/pkgs/development/python-modules/repath/default.nix index 619036f4b75..f66a42155da 100644 --- a/pkgs/development/python-modules/repath/default.nix +++ b/pkgs/development/python-modules/repath/default.nix @@ -1,7 +1,7 @@ { lib -, python3 , buildPythonPackage , fetchPypi +, six }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-gpITm6xqDkP9nXBgXU6NrrJdRmcuSE7TGiTHzgrvD7c="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/reprshed/default.nix b/pkgs/development/python-modules/reprshed/default.nix new file mode 100644 index 00000000000..1aa9469aab2 --- /dev/null +++ b/pkgs/development/python-modules/reprshed/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "python-reprshed"; + version = "1.0.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mentalisttraceur"; + repo = "python-reprshed"; + rev = "v${version}"; + hash = "sha256-XfmiewI74eDLKTAU6Ed76QXfJYMRb+idRACl6CW07ME="; + }; + + pythonImportsCheck = [ + "reprshed" + ]; + + meta = with lib; { + homepage = "https://github.com/mentalisttraceur/python-reprshed"; + description = "A toolshed for writing great __repr__ methods quickly and easily"; + license = licenses.bsd0; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index cfb58b4faef..d7b6f01d16c 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -1,22 +1,21 @@ { lib , betamax , buildPythonPackage -, fetchpatch , fetchPypi -, mock , pyopenssl , pytestCheckHook , requests +, trustme }: buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.10.1"; + version = "1.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YuCff/XMvakncqKfOUpJw61ssYHVaLEzdiayq7Yopj0="; + hash = "sha256-doGgo9BHAStb3A7jfX+PB+vnarCMrsz8OSHOI8iNW8Y="; }; propagatedBuildInputs = [ @@ -25,17 +24,9 @@ buildPythonPackage rec { nativeCheckInputs = [ betamax - mock + pyopenssl pytestCheckHook - ]; - - disabledTests = [ - # https://github.com/requests/toolbelt/issues/306 - "test_no_content_length_header" - "test_read_file" - "test_reads_file_from_url_wrapper" - "test_x509_der" - "test_x509_pem" + trustme ]; pythonImportsCheck = [ @@ -45,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolbelt of useful classes and functions to be used with requests"; homepage = "http://toolbelt.rtfd.org"; + changelog = "https://github.com/requests/toolbelt/blob/${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index d938fb1f219..0c34a24d086 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.21"; + version = "0.17.32"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + hash = "sha256-7JOQY3YZFOFFQpcqXLptM8I7CFmrY0L2HPBwz8YA78I="; }; # Tests use relative paths @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml/"; + changelog = "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 9054cb14d27..055d5ff8572 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -7,6 +7,7 @@ , numpy , fixtures , networkx +, testtools , libiconv , stdenv , lib @@ -37,12 +38,12 @@ buildPythonPackage rec { buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ fixtures networkx ]; + checkInputs = [ fixtures networkx testtools ]; pythonImportsCheck = [ "rustworkx" ]; meta = with lib; { - description = "A high performance Python graph library implemented in Rust."; + description = "A high performance Python graph library implemented in Rust"; homepage = "https://github.com/Qiskit/rustworkx"; license = licenses.asl20; maintainers = with maintainers; [ raitobezarius ]; diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index 197f5080022..c9402b30b12 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sanic-routing"; - version = "22.8.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-routing"; rev = "refs/tags/v${version}"; - hash = "sha256-2T6WY0nzvr8Q9lBoStzmX7m7Ct35lcG53OSLcqxkEcY="; + hash = "sha256-ual/vjL3M/nqlaRttJPoBcOYE3L/OAahbBLceUEVLXc="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index acb174c8699..8ebdeef2c86 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "22.12.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - hash = "sha256-pFTF2SQ9giRzPhG24FLqLPJRXaFdQ7Xi5EeltS7J3DI="; + hash = "sha256-WDiEuve9P9fLHxpK0UjxhbZUmWXtP+DV7e6OT19TASs="; }; outputs = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index eaa14240191..0ca77392079 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -1,30 +1,41 @@ { lib , stdenv -, aiofiles -, beautifulsoup4 , buildPythonPackage -, doCheck ? !stdenv.isDarwin # on Darwin, tests fail but pkg still works , fetchFromGitHub -, gunicorn + +# build-system +, setuptools + +# propagates +, aiofiles +, html5tagger , httptools , multidict -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonAtLeast , sanic-routing -, sanic-testing -, setuptools +, tracerite +, typing-extensions , ujson -, uvicorn , uvloop , websockets + +# optionals , aioquic + +# tests +, doCheck ? !stdenv.isDarwin # on Darwin, tests fail but pkg still works + +, beautifulsoup4 +, gunicorn +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, sanic-testing +, uvicorn }: buildPythonPackage rec { pname = "sanic"; - version = "22.12.0"; + version = "23.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,7 +44,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vj780rP5rJ+YsMWlb3BR9LTKT/nTt0C2H3J0X9sysj8="; + hash = "sha256-Ffw92mlYNV+ikb6299uw24EI1XPpl3Ju2st1Yt/YHKw="; }; nativeBuildInputs = [ @@ -42,15 +53,26 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiofiles - aioquic httptools + html5tagger multidict sanic-routing + tracerite + typing-extensions ujson uvloop websockets ]; + passthru.optional-dependencies = { + ext = [ + # TODO: sanic-ext + ]; + http3 = [ + aioquic + ]; + }; + nativeCheckInputs = [ beautifulsoup4 gunicorn @@ -58,7 +80,7 @@ buildPythonPackage rec { pytestCheckHook sanic-testing uvicorn - ]; + ] ++ passthru.optional-dependencies.http3; inherit doCheck; @@ -112,6 +134,8 @@ buildPythonPackage rec { disabledTestPaths = [ # We are not interested in benchmarks "benchmark/" + # We are also not interested in typing + "typing/test_typing.py" # unable to create async loop "test_app.py" "test_asgi.py" diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index f7a2c7e1b54..5b868bb42a6 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,34 +1,37 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling , distro , packaging -, python , setuptools -, setuptools-scm , wheel +, tomli # Test Inputs , cmake , cython -, flake8 -, ninja +, git , path , pytestCheckHook , pytest-mock -, pytest-virtualenv , requests -, six , virtualenv }: buildPythonPackage rec { pname = "scikit-build"; - version = "0.16.7"; + version = "0.17.6"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; - hash = "sha256-qbnMdHm3HmyNQ0WW363gJSU6riOtsiqaLYWFD9Uc7P0="; + pname = "scikit_build"; + inherit version; + hash = "sha256-tRpRo2s3xCZQmUtQR5EvWbIuMhCyPjIfKHYR+e9uXJ0="; }; # This line in the filterwarnings section of the pytest configuration leads to this error: @@ -37,24 +40,28 @@ buildPythonPackage rec { sed -i "/'error',/d" pyproject.toml ''; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ distro packaging setuptools - setuptools-scm wheel + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ cmake cython - ninja - path + git pytestCheckHook pytest-mock - pytest-virtualenv requests - six virtualenv ]; @@ -76,13 +83,10 @@ buildPythonPackage rec { "test_hello_sdist" "test_manifest_in_sdist" "test_sdist_with_symlinks" - # distutils.errors.DistutilsArgError: no commands supplied - "test_invalid_command" - "test_manifest_in_sdist" - "test_no_command" ]; meta = with lib; { + changelog = "https://github.com/scikit-build/scikit-build/blob/${version}/CHANGES.rst"; description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; homepage = "https://github.com/scikit-build/scikit-build"; license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index bd2a9be69b6..fa2510b0a44 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; + hash = "sha256-i+VJiG9e2kZDa25VWw5Ic7TxCqIcB99FxLwXNa+8zXo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 1090e724a7f..8d41b5504e0 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,9 +1,14 @@ { lib , stdenv -, fetchPypi +, fetchFromGitHub +, fetchpatch +, fetchurl +, writeText , python , pythonOlder , buildPythonPackage +, pypaBuildHook +, pipInstallHook , cython , gfortran , meson-python @@ -17,31 +22,77 @@ , pybind11 , pooch , libxcrypt +, xsimd +, blas +, lapack }: -buildPythonPackage rec { +let pname = "scipy"; - version = "1.10.1"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-LPnfuAp7RYm6TEDOdYiYbW1c68VFfK0sKID2vC1C86U="; + # DON'T UPDATE THESE ATTRIBUTES MANUALLY - USE: + # + # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy + # + # Even if you do update these hashes manually, don't change their base + # (base16 or base64), because the update script uses sed regexes to replace + # them with the updated hashes. + version = "1.11.1"; + srcHash = "sha256-bgnYXe3EhzL7+Gfriz1cXCl2eYQJ8zF+rcIwHyZR8bQ="; + datasetsHashes = { + ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; + ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; + face = "11i8x29h80y7hhyqhil1fg8mxag5f827g33lhnsf44qk116hp2wx"; + }; + datasets = lib.mapAttrs ( + d: hash: fetchurl { + url = "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat"; + sha256 = hash; + } + ) datasetsHashes; + # Additional cross compilation related properties that scipy reads in scipy/meson.build + crossFileScipy = writeText "cross-file-scipy.conf" '' + [properties] + numpy-include-dir = '${numpy}/${python.sitePackages}/numpy/core/include' + pythran-include-dir = '${pythran}/${python.sitePackages}/pythran' + host-python-path = '${python.interpreter}' + host-python-version = '${python.pythonVersion}' + ''; +in buildPythonPackage { + inherit pname version; + format = "other"; + + src = fetchFromGitHub { + owner = "scipy"; + repo = pname; + rev = "v${version}"; + hash = srcHash; + fetchSubmodules = true; }; patches = [ - # These tests require internet connection, currently impossible to disable - # them otherwise, see: - # https://github.com/scipy/scipy/pull/17965 - ./disable-datasets-tests.patch + # Helps with cross compilation, see https://github.com/scipy/scipy/pull/18167 + (fetchpatch { + url = "https://github.com/scipy/scipy/commit/dd50ac9d98dbb70625333a23e3a90e493228e3be.patch"; + hash = "sha256-Vf6/hhwu6X5s8KWhq8bUZKtSkdVu/GtEpGtj8Olxe7s="; + excludes = [ + "doc/source/dev/contributor/meson_advanced.rst" + ]; + }) ]; - nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" + ''; + + nativeBuildInputs = [ pypaBuildHook pipInstallHook cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ - numpy.blas + blas + lapack pybind11 pooch + xsimd ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; @@ -53,9 +104,29 @@ buildPythonPackage rec { doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + # Relax deps a bit + substituteInPlace pyproject.toml \ + --replace 'numpy==' 'numpy>=' + # Helps parallelization a bit export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; + # We download manually the datasets and this variable tells the pooch + # library where these files are cached. See also: + # https://github.com/scipy/scipy/pull/18518#issuecomment-1562350648 And at: + # https://github.com/scipy/scipy/pull/17965#issuecomment-1560759962 + export XDG_CACHE_HOME=$PWD; mkdir scipy-data + '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList (d: dpath: + # Actually copy the datasets + "cp ${dpath} scipy-data/${d}.dat" + ) datasets)); + + mesonFlags = [ + "-Dblas=${blas.pname}" + "-Dlapack=${lapack.pname}" + # We always run what's necessary for cross compilation, which is passing to + # meson the proper cross compilation related arguments. See also: + # https://docs.scipy.org/doc/scipy/building/cross_compilation.html + "--cross-file=${crossFileScipy}" + ]; # disable stackprotector on aarch64-darwin for now # @@ -79,17 +150,23 @@ buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time passthru = { - blas = numpy.blas; + inherit blas; + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" python.pkgs.scipy).file + ] + # Pass it the names of the datasets to update their hashes + ++ (builtins.attrNames datasetsHashes) + ; }; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - SCIPY_USE_G77_ABI_WRAPPER = 1; meta = with lib; { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; homepage = "https://www.scipy.org/"; license = licenses.bsd3; - maintainers = [ maintainers.fridh ]; + maintainers = with maintainers; [ fridh doronbehar ]; }; } diff --git a/pkgs/development/python-modules/scipy/disable-datasets-tests.patch b/pkgs/development/python-modules/scipy/disable-datasets-tests.patch deleted file mode 100644 index a06d0d50ddf..00000000000 --- a/pkgs/development/python-modules/scipy/disable-datasets-tests.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git i/scipy/datasets/meson.build w/scipy/datasets/meson.build -index 101377253..eec2feea4 100644 ---- i/scipy/datasets/meson.build -+++ w/scipy/datasets/meson.build -@@ -11,4 +11,3 @@ py3.install_sources( - subdir: 'scipy/datasets' - ) - --subdir('tests') diff --git a/pkgs/development/python-modules/scipy/update.sh b/pkgs/development/python-modules/scipy/update.sh new file mode 100755 index 00000000000..b0d6e2da4f4 --- /dev/null +++ b/pkgs/development/python-modules/scipy/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch-github + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift +datasets="$@" +echoerr datasets are: "$@" +latest_release=$(curl --silent https://api.github.com/repos/scipy/scipy/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-) +# Update version, if needed +if grep -q 'version = "'$version $fname; then + echo "Current version $version is the latest available, will update only datasets' hashes (don't take long)" +else + echoerr got version $version + sed -i -E 's/(version = ).*=/\1'$version'/g' $fname + # Update srcHash + srcHash='"sha256-'$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .sha256)'"' + sed -i 's/srcHash = .*=";/srcHash = '$srcHash';/g' $fname +fi + +for d in $datasets; do + datasetHash=$(nix-prefetch-url "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat") + sed -i 's/'$d' = "[0-9a-z]\+/'$d' = "'$datasetHash'/g' $fname + echoerr updated hash for dataset "'$d'" +done diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index f1bf3816918..c429c6f6478 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vsNuTwxxKyWwFPxMCQkSyQDnMLUYMLJ28AUnVrh3ksE="; + hash = "sha256-ggqSS5SWJvKxYzCz4Q9LkA0hXmj/3iGhMKeNb/UQVXg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index 63c07793931..53fa54a5aff 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -3,42 +3,56 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling , idna , pyasn1 , pyasn1-modules -, six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "service-identity"; - version = "21.1.0"; + version = "23.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pyca"; repo = pname; - rev = version; - hash = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; + rev = "refs/tags/${version}"; + hash = "sha256-PGDtsDgRwh7GuuM4OuExiy8L4i3Foo+OD0wMrndPkvo="; }; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ attrs cryptography idna pyasn1 pyasn1-modules - six ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "service_identity" ]; + pythonImportsCheck = [ + "service_identity" + ]; meta = with lib; { description = "Service identity verification for pyOpenSSL"; homepage = "https://service-identity.readthedocs.io"; + changelog = "https://github.com/pyca/service-identity/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 906d6355e9b..e71d8bc78dc 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.5.2"; + version = "1.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2NrMsU3A6uG2tus+zveWdb03tAZTafecNTk91cVWUsc="; + hash = "sha256-yG5zTerDMFl5mL+8CNpFGH5rJ4N+I72R6tsyBzI5ImI="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 26479aacdad..6f05b7324c8 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68="; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview4 ]; + buildInputs = [ gtk3 gtksourceview4 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ nest-asyncio diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index ca360eb0bd4..30cf185c1aa 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -32,6 +32,12 @@ buildPythonPackage rec { hash = "sha256-s9djd/MDNnyNkjkeApY6Fb1mhI6iop8RghaSJdi4eAs="; }; + # The packaged pytest-runner version is too new as of 2023-07-27. It's not really needed anyway. Unfortunately, + # pythonRelaxDepsHook doesn't work on setup_requires packages. + postPatch = '' + substituteInPlace setup.py --replace "pytest-runner==5.2" "" + ''; + propagatedBuildInputs = [ slack-sdk ]; nativeCheckInputs = [ @@ -68,6 +74,7 @@ buildPythonPackage rec { "test_interactions" "test_lazy_listener_calls" "test_lazy_listeners" + "test_failure" ]; pythonImportsCheck = [ "slack_bolt" ]; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index f02f82adf1a..42b225aa381 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -36,7 +36,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # broke after aiohttp 3.8.5 upgrade + "test_client_stop_no_wait" + ] ++ lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix index 19c41c35ac1..509505b2702 100644 --- a/pkgs/development/python-modules/socid-extractor/default.nix +++ b/pkgs/development/python-modules/socid-extractor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socid-extractor"; - version = "0.0.24"; + version = "0.0.25"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "soxoj"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-INewgfm+E2t4QfE+SRAm5a74AKsifNtnwC0WPBqPUns="; + hash = "sha256-3aqtuaecqtUcKLp+LRUct5aZb9mP0cE9xH91xWqtb1Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 88d8d66cda5..aca87f3c893 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.22"; + version = "1.23.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-cfyi1e7psDQgTkxoarILTY9euUCTliFryubIfDjhjqY="; + hash = "sha256-XUTimWYzza2kmbbSeklt3528ld0fDwn3s3lAJJ5h9uk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 002b71b474b..4e585353687 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.4.1"; + version = "0.5.0"; format = "flit"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "sphinx_design"; - hash = "sha256-W2QYukotw9g1kuoP9hpSqJH+chlaTDoYsvocdmjORwg="; + hash = "sha256-6OUTrOpvktFcbeOzTpVEWPJFuOdhtFtjlQ9lNzNSqwA="; }; nativeBuildInputs = [ flit-core ]; @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sphinx extension for designing beautiful, view size responsive web components"; homepage = "https://github.com/executablebooks/sphinx-design"; + changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index e978defcbf4..fa0d3ad6cad 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -4,7 +4,6 @@ , flask , flask-login , flask-sqlalchemy -, flexmock , psycopg2 , pymysql , pytestCheckHook @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "sqlalchemy-continuum"; - version = "1.3.14"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLAlchemy-Continuum"; inherit version; - hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; + hash = "sha256-Rk+aWxBjUrXuRPE5MSyzWMWS0l7qrjU3wOrHLC+vteU="; }; propagatedBuildInputs = [ @@ -42,9 +41,6 @@ buildPythonPackage rec { flask-sqlalchemy = [ flask-sqlalchemy ]; - flexmock = [ - flexmock - ]; i18n = [ sqlalchemy-i18n ]; @@ -57,12 +53,7 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Indicate tests that we don't have a database server at hand - DB = "sqlite"; - - disabledTestPaths = [ - # Test doesn't support latest SQLAlchemy - "tests/plugins/test_flask.py" - ]; + env.DB = "sqlite"; pythonImportsCheck = [ "sqlalchemy_continuum" @@ -74,8 +65,5 @@ buildPythonPackage rec { changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - - # https://github.com/kvesteri/sqlalchemy-continuum/issues/326 - broken = versionAtLeast sqlalchemy.version "2"; }; } diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 5ef27560618..2f5f5d1a8e2 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.18"; + version = "2.0.19"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-juZIFlmgwGFFhv+3DsMx6k1QRcGLQyTOwR5Hii8A68c="; + hash = "sha256-97q04wQVtlV2b6VJHxvnQ9ep76T5umn1KI3hXh6a8kU="; }; nativeBuildInputs =[ diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index f03ad507010..2ce5a49b8d1 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -2,22 +2,23 @@ , buildPythonPackage , pythonOlder , fetchPypi -, wrapio +, setuptools-scm }: buildPythonPackage rec { pname = "survey"; - version = "3.4.3"; + version = "4.5.4"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I="; + hash = "sha256-wjpO1+9AXi75uPXOTE5/owEiZgtffkkMAaZ+gDO0t5I="; }; - propagatedBuildInputs = [ - wrapio + nativeBuildInputs = [ + setuptools-scm ]; doCheck = false; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a135f31578c..a88e21021e4 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.11.1"; + version = "1.12"; src = fetchPypi { inherit pname version; - hash = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; + hash = "sha256-6/WVyNrD4P3EFSxRh4tJg5bsfzDnqRTWBx5nTUlCD7g="; }; nativeCheckInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 5bb66896504..fbedcae3cc5 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -21,7 +21,8 @@ , backports_weakref , tensorflow-estimator-bin , tensorboard -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? {} , zlib , python diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ba7c36c9503..d95678f7fc6 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -17,7 +17,8 @@ # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? { } , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , mklSupport ? false, mkl diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index d005791642a..5ce4c59490d 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.0"; + version = "3.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6H8miS0tKB99ZkiBvqJ77NIsswJ+ivYt1VZOLwTQr24="; + hash = "sha256-K68UhtPtgTZoAl9NG5ZHOwzsvDl028coXS4ZpmJ0ULs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index ce272b9d7a4..268ee997853 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d0MNJytT2s073Ur11WP9wkrlG4b9vJzy6BRvKceryaQ="; + sha256 = "sha256-pz82cutgQ9ifMS6+40mcBiOsXIqeEquYdBWT+npZNPY="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/pkgs/development/python-modules/theano/default.nix b/pkgs/development/python-modules/theano/default.nix index 1bcbda650a2..428bf4310d6 100644 --- a/pkgs/development/python-modules/theano/default.nix +++ b/pkgs/development/python-modules/theano/default.nix @@ -11,8 +11,9 @@ , setuptools , six , libgpuarray -, cudaSupport ? false, cudaPackages ? {} -, cudnnSupport ? false +, config +, cudaSupport ? config.cudaSupport, cudaPackages ? { } +, cudnnSupport ? cudaSupport }: let diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 861560c2aee..605291edda0 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,28 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, enum34 -, functools32, typing ? null + +# build-system +, poetry-core + +# tests , pytestCheckHook -, pyaml +, pyyaml }: buildPythonPackage rec { pname = "tomlkit"; - version = "0.11.6"; + version = "0.12.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM="; + hash = "sha256-OOH/jtuZEnPsn2GBJEpqORrDDp9QmOdTVkDqa+l6fIY="; }; - propagatedBuildInputs = - lib.optionals isPy27 [ enum34 functools32 ] - ++ lib.optional isPy27 typing; + nativeBuildInputs = [ + poetry-core + ]; nativeCheckInputs = [ - pyaml + pyyaml pytestCheckHook ]; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 5e0c5680007..912628bf949 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildPythonPackage, python, - cudaSupport ? false, cudaPackages, magma, + config, cudaSupport ? config.cudaSupport, cudaPackages, magma, useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index fe7df9d9efc..3c18e7cbdc0 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , asn1crypto , cffi @@ -28,6 +29,19 @@ buildPythonPackage rec { hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; + patches = [ + # This patches the call to the C preprocessor not to include types + # pycparser does not handle. + # `hardeningDisable = [ "fortify" ]` would have the same effect but + # would also disable hardening from generated FFI objects. + # + # backport of https://github.com/tpm2-software/tpm2-pytss/pull/523 + (fetchpatch { + url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch"; + sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o="; + }) + ]; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix new file mode 100644 index 00000000000..e94e8a8d1d9 --- /dev/null +++ b/pkgs/development/python-modules/tracerite/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, html5tagger +, python +}: + +buildPythonPackage rec { + pname = "tracerite"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "tracerite"; + rev = "v${version}"; + hash = "sha256-At8wVR3EcHEi051BBfjb+sOhs93GyzWlEAjtehTMeNU="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + html5tagger + ]; + + postInstall = '' + cp tracerite/style.css $out/${python.sitePackages}/tracerite + ''; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "tracerite" + ]; + + meta = with lib; { + description = "Tracebacks for Humans (in Jupyter notebooks"; + homepage = "https://github.com/sanic-org/tracerite"; + license = licenses.unlicense; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index ea4f0e265d7..43f147a6a9c 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ let pname = "trainer"; - version = "0.0.27"; + version = "0.0.29"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-2uITlcaGcRujhSZPK746d13X8ZrgaGbfMZruLmTpQIs="; + hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index e3f6f5e7bfb..aa37946026f 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -1,13 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, pytest -, mock -, ipython_genutils -, decorator +, pytestCheckHook , pythonOlder -, six , hatchling }: @@ -23,16 +18,12 @@ buildPythonPackage rec { }; nativeBuildInputs = [ hatchling ]; - nativeCheckInputs = [ glibcLocales pytest mock ]; - propagatedBuildInputs = [ ipython_genutils decorator six ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" py.test - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Traitlets Python config system"; - homepage = "https://ipython.org/"; + homepage = "https://github.com/ipython/traitlets"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 3454883c602..7cd0dd7ca8a 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -6,33 +6,45 @@ , pythonOlder }: -buildPythonPackage rec { - pname = "trove-classifiers"; - version = "2023.5.24"; - format = "setuptools"; +let + self = buildPythonPackage rec { + pname = "trove-classifiers"; + version = "2023.7.6"; + format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-/VoVRig76UH0dUChNb3q6PsmE4CmogTZwYAS8qGwzq4="; - }; + src = fetchPypi { + inherit pname version; + hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"calver"' "" + ''; + + nativeBuildInputs = [ + calver + ]; + + doCheck = false; # avoid infinite recursion with hatchling - nativeBuildInputs = [ - calver - ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + pythonImportsCheck = [ "trove_classifiers" ]; - pythonImportsCheck = [ "trove_classifiers" ]; + passthru.tests.trove-classifiers = self.overridePythonAttrs { doCheck = true; }; - meta = { - description = "Canonical source for classifiers on PyPI"; - homepage = "https://github.com/pypa/trove-classifiers"; - changelog = "https://github.com/pypa/trove-classifiers/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; + meta = { + description = "Canonical source for classifiers on PyPI"; + homepage = "https://github.com/pypa/trove-classifiers"; + changelog = "https://github.com/pypa/trove-classifiers/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 7b12ef05fac..582a9e0f563 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -111,6 +111,7 @@ buildPythonPackage rec { echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'WrapClientTLSParserTests.test_tls.skip = "pyopenssl update"' >> src/twisted/internet/test/test_endpoints.py echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 319082c8a64..8a169a2d9ce 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.23.0.1"; + version = "4.23.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e9XqEioFexGoK3hdneRkkyoekXX+l3pBKK3vEdfzVUc="; + hash = "sha256-EGawadTw4Jveu2TKTzXMa4rM9S+Ag2gEbM7JZ0SvA3U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 655e96f2e3f..76691b13b12 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.2.0.1"; + version = "23.2.0.2"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-vutdInBMYloeS23HVjVcW0rwuYATi3AqnZ+TKs8CCQM="; + hash = "sha256-agENrJ7NQrWC190sw+nkBIa3mztkuy//uhR0/5avkG0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 314175c7041..e191d56d69d 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.2"; + version = "4.6.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-0O/NlvZf0gNkN8KdjBJWbP3FSTRdc+3aywSIuBr/n54="; + hash = "sha256-797zfcDAS/V4YZVlH9aU+L/daT6sCexK9G2Q9yZSVY8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index a5d27c1f71b..59eb7455478 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "typing-inspect"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit version; pname = "typing_inspect"; - hash = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0="; + hash = "sha256-sj/EL/b272lU5IUsH7USzdGNvqAxNPkfhWqVzMlGH3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 392e8e89924..5b32b4343a0 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , pythonOlder , fetchPypi +, setuptools +, wheel , pytz-deprecation-shim , pytest-mock , pytestCheckHook @@ -10,15 +12,22 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.2"; # version needs to be compatible with APScheduler + version = "4.3"; # version needs to be compatible with APScheduler - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7"; + hash = "sha256-PyHQnhsqqfLazKEtokDKN947pSN6k63f1tWTr+kHM1U="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ pytz-deprecation-shim ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 2573bdc51ec..b93552c4e07 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -11,18 +11,17 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.24.1"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.5"; - # Fetching from GitHub as Pypi contains different versions src = fetchFromGitHub { owner = "harfbuzz"; repo = "uharfbuzz"; rev = "v${version}"; - hash = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg="; fetchSubmodules = true; + hash = "sha256-CZp+/5fG5IBawnIZLeO9lXke8rodqRcSf+ofyF584mc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +43,6 @@ buildPythonPackage rec { description = "Streamlined Cython bindings for the harfbuzz shaping engine"; homepage = "https://github.com/harfbuzz/uharfbuzz"; license = licenses.asl20; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix new file mode 100644 index 00000000000..7b3b5c8983c --- /dev/null +++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# propagated build inputs +, click +, fastapi +, jinja2 +, mypy +, nbconvert +, python-multipart +, pandas +, types-requests +, types-ujson +, uvicorn +, autoflake +# native check inputs +, pytestCheckHook +, black +, coverage +, flake8 +, httpx +, ipython +, pytest-cov +, requests +, requests-toolbelt +, nbdev +, pytest-mock +}: +let + version = "0.10.10"; +in +buildPythonPackage { + pname = "unstructured-api-tools"; + inherit version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-api-tools"; + rev = version; + hash = "sha256-CJ5bsII24hw03JN4+8VywYRYCsnMlYHjmaIIn0zttIs="; + }; + + propagatedBuildInputs = [ + click + fastapi + jinja2 + mypy + nbconvert + python-multipart + pandas + types-requests + types-ujson + uvicorn + autoflake + ] ++ uvicorn.optional-dependencies.standard; + + pythonImportsCheck = [ "unstructured_api_tools" ]; + + # test require file generation but it complains about a missing file mypy + doCheck = false; + # preCheck = '' + # substituteInPlace Makefile \ + # --replace "PYTHONPATH=." "" \ + # --replace "mypy" "${mypy}/bin/mypy" + # make generate-test-api + # ''; + + nativeCheckInputs = [ + pytestCheckHook + black + coverage + flake8 + httpx + ipython + pytest-cov + requests + requests-toolbelt + nbdev + pytest-mock + ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Unstructured-IO/unstructured-api-tools"; + changelog = "https://github.com/Unstructured-IO/unstructured-api-tools/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix new file mode 100644 index 00000000000..542e6f0adc2 --- /dev/null +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -0,0 +1,143 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# propagated build inputs +, chardet +, filetype +, lxml +, msg-parser +, nltk +, openpyxl +, pandas +, pdf2image +, pdfminer-six +, pillow +, pypandoc +, python-docx +, python-pptx +, python-magic +, markdown +, requests +, tabulate +, xlrd +# optional-dependencies +, langdetect +, sacremoses +, sentencepiece +, torch +, transformers +, unstructured-inference +, s3fs +, fsspec +, adlfs +# , discord-py +, pygithub +, python-gitlab +, praw +, slack-sdk +, wikipedia +, google-api-python-client +# , gcsfs +, elasticsearch8 +, jq +# , dropboxdrivefs +, atlassian-python-api +# test dependencies +, pytestCheckHook +, black +, coverage +, click +, freezegun +# , label-studio-sdk +, mypy +, pytest-cov +, pytest-mock +, vcrpy +, grpcio +}: +let + version = "0.8.1"; + optional-dependencies = { + huggingflace = [ + langdetect + sacremoses + sentencepiece + torch + transformers + ]; + local-inference = [ unstructured-inference ]; + s3 = [ s3fs fsspec ]; + azure = [ adlfs fsspec ]; + discord = [ ]; # discord-py + github = [ pygithub ]; + gitlab = [ python-gitlab ]; + reddit = [ praw ]; + slack = [ slack-sdk ]; + wikipedia = [ wikipedia ]; + google-drive = [ google-api-python-client ]; + gcs = []; # gcsfs fsspec + elasticsearch = [ elasticsearch8 jq ]; + dropbox = []; # dropboxdrivefs fsspec + confluence = [ atlassian-python-api ]; + }; +in +buildPythonPackage { + pname = "unstructured"; + inherit version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured"; + rev = version; + hash = "sha256-I9pRycg3uGn7Xfd4YGxic16SXi8+gslsIVarzDT8X2w="; + }; + + propagatedBuildInputs = [ + chardet + filetype + lxml + msg-parser + nltk + openpyxl + pandas + pdf2image + pdfminer-six + pillow + pypandoc + python-docx + python-pptx + python-magic + markdown + requests + tabulate + xlrd + ]; + + pythonImportsCheck = [ "unstructured" ]; + + # test try to download punkt from nltk + # figure out how to make it available to enable the tests + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + black + coverage + click + freezegun + mypy + pytest-cov + pytest-mock + vcrpy + grpcio + ]; + + meta = with lib; { + description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; + homepage = "https://github.com/Unstructured-IO/unstructured"; + changelog = "https://github.com/Unstructured-IO/unstructured/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index cd7496d636d..13ef39be76d 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.14"; + version = "1.26.16"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-B2kHv4/TVc3ndyhHExZiWk0vfnE8El9RlTu1s+7PT3I="; + hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; }; # FIXME: remove backwards compatbility hack diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 2f61e8847ac..d8369260587 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "usort"; - version = "1.1.0b2"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "facebook"; repo = "usort"; rev = "refs/tags/v${version}"; - hash = "sha256-c3gQ+f/BRgM+Nwc+mEP7dcmig7ws7FqL5zwQhNJJlsI="; + hash = "sha256-emnrghdsUs+VfvYiJExG13SKQNrXAEtGNAJQLScADnw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index e48536e6635..9baa150afb7 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.20.0"; - disabled = pythonOlder "3.7"; + version = "0.23.1"; + disabled = pythonOlder "3.8"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-yca6JI3/aqdZF7SxFeYr84GOeQnLBmbm1dIXjngX9Ng="; + hash = "sha256-X/G6K0X4G1EsMIBpvqy62zZ++8paTHNqgYLi+B7YK+0="; }; outputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click h11 - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index 4ada58e1d99..805e8df1c71 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -1,12 +1,10 @@ { stdenv , buildPythonPackage -, asgiref +, a2wsgi , uvicorn , httpx -, pytest-asyncio , pytestCheckHook , pytest-mock -, requests , trustme , watchgod , wsproto @@ -23,16 +21,14 @@ buildPythonPackage { dontInstall = true; nativeCheckInputs = [ - asgiref uvicorn httpx pytestCheckHook - pytest-asyncio pytest-mock - requests trustme # strictly optional dependencies + a2wsgi watchgod wsproto ] diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 2f562a02ffd..40c4b0b1fc9 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -1,34 +1,41 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, decorator -, six +, fetchFromGitHub +, poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "validators"; - version = "0.20.0"; - disabled = isPy27; + version = "0.21.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-JBSM5OZBAKLV4mcjPiPnr+tVMWtH0w+q5+tucpK8Imo="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "python-validators"; + repo = "validators"; + rev = "refs/tags/${version}"; + hash = "sha256-b5K1WP+cEAjPBXu9sAZQf1J5H7PLnn94400Zd/0Y9ew="; }; - propagatedBuildInputs = [ - decorator - six + nativeBuildInputs = [ + poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "validators" + ]; + meta = with lib; { - description = "Python Data Validation for Humans™"; + description = "Python Data Validation for Humans"; homepage = "https://github.com/kvesteri/validators"; + changelog = "https://github.com/python-validators/validators/blob/${version}/CHANGES.md"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch b/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch deleted file mode 100644 index 2b34da289e2..00000000000 --- a/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 21563405d6e2348ee457187f7fb61beb102bb367 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Sun, 24 May 2020 09:33:13 +0200 -Subject: [PATCH] Check base_prefix and base_exec_prefix for Python 2 - -This is a Nixpkgs-specific change so it can support virtualenvs from Nix envs. ---- - src/virtualenv/discovery/py_info.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/virtualenv/discovery/py_info.py b/src/virtualenv/discovery/py_info.py -index 6f12128..74e9218 100644 ---- a/src/virtualenv/discovery/py_info.py -+++ b/src/virtualenv/discovery/py_info.py -@@ -51,13 +51,17 @@ class PythonInfo(object): - self.version = u(sys.version) - self.os = u(os.name) - -+ config_vars = {} if sys.version_info.major is not 2 else sysconfig._CONFIG_VARS -+ base_prefix = config_vars.get("prefix") -+ base_exec_prefix = config_vars.get("exec_prefix") -+ - # information about the prefix - determines python home - self.prefix = u(abs_path(getattr(sys, "prefix", None))) # prefix we think -- self.base_prefix = u(abs_path(getattr(sys, "base_prefix", None))) # venv -+ self.base_prefix = u(abs_path(getattr(sys, "base_prefix", base_prefix))) # venv - self.real_prefix = u(abs_path(getattr(sys, "real_prefix", None))) # old virtualenv - - # information about the exec prefix - dynamic stdlib modules -- self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", None))) -+ self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", base_exec_prefix))) - self.exec_prefix = u(abs_path(getattr(sys, "exec_prefix", None))) - - self.executable = u(abs_path(sys.executable)) # the executable we were invoked via --- -2.25.1 - diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 28100b8c55e..10602bfd4f3 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -11,24 +11,24 @@ , hatch-vcs , hatchling , importlib-metadata -, importlib-resources , platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook +, time-machine }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.19.0"; + version = "20.24.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N6ZAuoLtQLImWZxSLUEeS+XtszmgwN4DDA3HtkbWFZA="; + hash = "sha256-4qfO+dqIDWk7kz23ZUNndU8U4gZQ3GDo7nOFVx+Fk6M="; }; nativeBuildInputs = [ @@ -40,16 +40,10 @@ buildPythonPackage rec { distlib filelock platformdirs - ] ++ lib.optionals (pythonOlder "3.7") [ - importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - patches = lib.optionals (isPy27) [ - ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch - ]; - nativeCheckInputs = [ cython flaky @@ -57,6 +51,8 @@ buildPythonPackage rec { pytest-mock pytest-timeout pytestCheckHook + ] ++ lib.optionals (!isPyPy) [ + time-machine ]; preCheck = '' @@ -91,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; - changelog = "https://github.com/pypa/virtualenv/releases/tag/${version}"; + changelog = "https://github.com/pypa/virtualenv/blob/${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 2bbff0485b2..54c30dabc78 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -7,7 +7,7 @@ , django-filter , django-modelcluster , django-taggit -, django_treebeard +, django-treebeard , djangorestframework , draftjs-exporter , fetchPypi @@ -24,26 +24,27 @@ buildPythonPackage rec { pname = "wagtail"; - version = "4.2.2"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8="; + hash = "sha256-3r0h34el2zRF1l/94S7xTjBqJPWtSQFQvtVW8Mjq0rs="; }; postPatch = '' substituteInPlace setup.py \ - --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" + --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ + --replace "Pillow>=4.0.0,<10.0.0" "Pillow>=9.1.0,<11.0.0" ''; propagatedBuildInputs = [ anyascii beautifulsoup4 django - django_treebeard + django-treebeard django-filter django-modelcluster django-taggit diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0bd4bec4d51..0111a43b06c 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.42.3"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w="; + hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index d4d297d68d4..f7030f7c874 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -2,22 +2,29 @@ , buildPythonPackage , fetchPypi , pythonOlder -, six -, pillow + +# dependencies +, filetype +, defusedxml, }: buildPythonPackage rec { pname = "willow"; - version = "1.4.1"; + version = "1.5.1"; + format = "setuptools"; + disabled = pythonOlder "2.7"; src = fetchPypi { pname = "Willow"; inherit version; - hash = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; + hash = "sha256-t6SQkRATP9seIodZLgZzzCVeAobhzVNCfuaN8ckiDEw="; }; - propagatedBuildInputs = [ six pillow ]; + propagatedBuildInputs = [ + filetype + defusedxml + ]; # Test data is not included # https://github.com/torchbox/Willow/issues/34 diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index e700f630b66..bf8b03aa096 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2023.2.0"; + version = "2023.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc="; + hash = "sha256-2s4v2/G3/xhdnBImokv4PCrlLzJT2/6A4X0RYmANBVw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index ba03f1bf04c..07615180608 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.11.1"; + version = "2.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9H5LQX6uXWr9pQ/WosNl1LrcbR+MAwVtZv8Cdb+WFvg="; + hash = "sha256-rKvHb0wkWVuZO8M8uIQdOiY1N6DmGSpqUgz4YYbUfSM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 54375efd1e9..727306bea22 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -1,4 +1,5 @@ { lib +, async-interrupt , async-timeout , bleak , bleak-retry-connector @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.2.2"; + version = "2.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yZHEEn9+/wbiKs6NYyExP3nagvap/zdOmzhWAG7i+vA="; + hash = "sha256-Z8pPN9cO/8jv66yrG2EKRDXNjKPbYarOOB5t9ObMzek="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-interrupt async-timeout bleak bleak-retry-connector diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 552a1333e8f..0f27248c688 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.14.2"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aOxZuOvfxP7l4yvWwM4nP3L31O0BdFS0UyfGc8YJB7w="; + hash = "sha256-hONraVvaDs6lKvmGEnGYTLIqXIZGeZB7e5uj95toT34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index b16248fb9fc..1b033810b5b 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.15.0"; + version = "3.16.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ESkprWSdqUHCPeUPNWorVXDJVLZRUGQrzN1mvxlNIks="; + hash = "sha256-68FZRqp4vWNFiZL8gew7b3sektUcNebeHDgE5zt5kUc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix deleted file mode 100644 index a3583654e66..00000000000 --- a/pkgs/development/python-modules/zope_broken/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_interface -}: - -buildPythonPackage rec { - pname = "zope.broken"; - version = "3.6.0"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999"; - }; - - buildInputs = [ zope_interface ]; - - meta = with lib; { - homepage = "http://pypi.python.org/pypi/zope.broken"; - description = "Zope Broken Object Interfaces"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a9eb1f96ab8..85af181698c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -239,9 +239,9 @@ in }; gio2 = attrs: { - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ pkg-config gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre pcre2 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; + buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; diff --git a/pkgs/development/tools/aapt/default.nix b/pkgs/development/tools/aapt/default.nix new file mode 100644 index 00000000000..0d59f3ae6f8 --- /dev/null +++ b/pkgs/development/tools/aapt/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchzip +, autoPatchelfHook +, libcxx +}: + +stdenvNoCC.mkDerivation rec { + pname = "aapt"; + version = "8.0.2-9289358"; + + src = + let + urlAndHash = + if stdenvNoCC.isLinux then { + url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-linux.jar"; + hash = "sha256-P8eVIS6zaZGPh4Z7SXUiLtZaX1YIsSmGOdvF6Xb1WHI="; + } else if stdenvNoCC.isDarwin then { + url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-osx.jar"; + hash = "sha256-hDfEPk3IJt+8FbRVEiHQbn24vsuOe6m36UcQsT6tGsQ="; + } else throw "Unsupport platform: ${stdenvNoCC.system}"; + in + fetchzip (urlAndHash // { + extension = "zip"; + stripRoot = false; + }); + + nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenvNoCC.isLinux [ libcxx ]; + + installPhase = '' + runHook preInstall + + install -D aapt2 $out/bin/aapt2 + + runHook postInstall + ''; + + meta = { + description = "A build tool that compiles and packages Android app's resources"; + homepage = "https://developer.android.com/tools/aapt2"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ linsui ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} + diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 6652ee134f9..e1a6b8c3416 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -4,15 +4,6 @@ , gdk-pixbuf, wrapGAppsHook }: -let why3_1_5 = why3.overrideAttrs (o: rec { - version = "1.5.1"; - src = fetchurl { - url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz"; - hash = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; - }; - }); in -let why3 = why3_1_5; in - let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ @@ -45,33 +36,25 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "26.1"; - slang = "Iron"; + version = "27.1"; + slang = "Cobalt"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg="; + hash = "sha256-WxNXShaliXHCeQm+6Urn83sX2JeFK0DHaKPU4uCeOdI="; }; - patches = [ - (fetchpatch { - name = "fixes-yojson-2_1-support.patch"; - url = "https://git.frama-c.com/pub/frama-c/-/commit/647eace02ed8dac46e75452898c3470f82576818.patch"; - hash = "sha256-XfLi4kW1Y2MCLjHHQZAD8DvXvfZuDH3OKd9hlTV0XCw="; - }) - ]; - postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; strictDeps = true; - nativeBuildInputs = [ wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib dune_3 ]); + nativeBuildInputs = [ wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib dune_3 menhir ]); buildInputs = with ocamlPackages; [ dune-site dune-configurator ltl2ba ocamlgraph yojson menhirLib camlzip lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen - ppx_deriving ppx_import ppx_deriving_yojson + ppx_deriving ppx_import ppx_deriving_yaml ppx_deriving_yojson gdk-pixbuf ]; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index abf9bbb4865..99ee4d101b2 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, build-tools }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, jdk_headless +, aapt +}: stdenv.mkDerivation rec { pname = "apktool"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-szEyPr8yXWPhM3WmFHkV+drASPDx+GeDgG+SWUF0jbw="; + hash = "sha256-e0qOFwPiKNIG2ylkS3EUFofYoRG1WwObCLAt+kQ6sPk="; }; dontUnpack = true; @@ -19,23 +25,20 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = - let - tools = builtins.head build-tools; - in '' + '' install -D ${src} "$out/libexec/apktool/apktool.jar" mkdir -p "$out/bin" - makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ + makeWrapper "${jdk_headless}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${tools}/libexec/android-sdk/build-tools/${tools.version}" + --prefix PATH : ${lib.getBin aapt} ''; meta = with lib; { description = "A tool for reverse engineering Android apk files"; - homepage = "https://ibotpeaches.github.io/Apktool/"; + homepage = "https://ibotpeaches.github.io/Apktool/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; - platforms = with platforms; unix; + platforms = with platforms; unix; }; - } diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index 924cf5e834a..0dca25bc272 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-B0oN5qYCShIsSvMFJB5EJPWOWM3Ubn8jl2gm+l5Wqg0="; + hash = "sha256-xuSoTTtULVdG1LZFiEPYYuwJxG7FdN9vY+7K7OmfWZI="; }; - cargoHash = "sha256-50ETDUKbK4oeVm9Ox44WVrAH5EAdH9F+sQk0WBTEQmY="; + cargoHash = "sha256-BJaVaOBCLH5c7/DrsOq6uVN02wEfLA7k+FgxCBmOUTA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index a91500e1494..90bfa83ca8d 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -46,7 +46,6 @@ python3.pkgs.buildPythonApplication rec { --replace 'boto3>=' 'boto3>=1.26.79 #' \ --replace 'cfn-lint~=0.77.9' 'cfn-lint~=0.73.2' \ --replace 'docker~=6.1.0' 'docker~=6.0.1' \ - --replace 'pyopenssl~=23.2.0' 'pyopenssl~=23.1.0' \ --replace 'ruamel_yaml~=0.17.32' 'ruamel_yaml~=0.17.21' \ --replace 'tomlkit==0.11.8' 'tomlkit~=0.11.6' \ --replace 'typing_extensions~=4.4.0' 'typing_extensions~=4.4' \ diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 31714db5c89..f46e9667cbe 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pythonOlder , setuptools +, testtools }: buildPythonApplication rec { @@ -30,6 +31,7 @@ buildPythonApplication rec { fixtures mock pytestCheckHook + testtools ]; pythonImportsCheck = [ "bashate" ]; diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 82f67523389..c066a9c5553 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-DMZYjtIuN8b03UOAEtz32+Cj2MaE46v2k0IHT7YiZfk="; + hash = "sha256-koYRJCO9G8McoFNe2P61y+q7T4gZ1MBNAy9jFC63kds="; }; - vendorHash = "sha256-uBM5r3cT0c4NUOfWaqkxRJ06p2GtOwvSOQfvP77ivTA="; + vendorHash = "sha256-2UA8rp2ZHTUnYialFXrIlH+RzfZHtdKn0dc+Dfps8ow="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 4206bc48927..c912818285a 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -10,11 +10,11 @@ assert jdk != null; stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0="; + hash = "sha256-4eE6wMQvO2TZAMV//GUuzvaCuCVdfTVO+7tPYlGdpPE="; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 2f35d730c74..592790da0ac 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; - rev = version; - hash = "sha256-CqQ8rj45RES3BV7RBfGr/JX9GzjyRuA1sxgKzQx+oE8="; + rev = "v${version}"; + hash = "sha256-iYLebD41x03kCW/k+bYVaYa2/erhrx/EithLaeTKfCw="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; @@ -28,6 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; homepage = "https://github.com/bazelbuild/buildtools"; + changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ] diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 7b6e8a5123a..f1ceb79dcdf 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -10,13 +10,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20230414"; + version = "20230711"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-KcsdJqrn3p3vkr2us6rUUg6JlRzpey518LibrhuVOZ8="; + url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; + hash = "sha256-CoFULAPxoObCe/UBXY+7xSY04RkIOOx9p2RYR9kzL+8="; }; + patches = [ + # make bootstrap script aware of the prefix in /nix/store + ./bootstrap-fix.patch + # preserve PATH from build env in unit tests + ./fix-unexport-env-test.patch + # Always enable ksh test since it checks in a impure location /bin/ksh + ./unconditional-ksh-test.patch + # decouple tests from build phase + ./dont-test-while-installing.diff + ]; + # Make tests work with musl # * Disable deptgt-delete_on_error test (alpine does this too) # * Disable shell-ksh test (ksh doesn't compile with musl) @@ -30,27 +41,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ getopt ]; - patches = [ - # make bootstrap script aware of the prefix in /nix/store - ./bootstrap-fix.patch - # preserve PATH from build env in unit tests - ./fix-unexport-env-test.patch - # Always enable ksh test since it checks in a impure location /bin/ksh - ./unconditional-ksh-test.patch - # decouple tests from build phase - (fetchpatch { - name = "separate-tests.patch"; - url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch"; - hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM="; - }) - # add a shebang to bmake's install(1) replacement - (fetchpatch { - name = "install-sh.patch"; - url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch"; - hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0="; - }) - ]; - # The generated makefile is a small wrapper for calling ./boot-strap with a # given op. On a case-insensitive filesystem this generated makefile clobbers # a distinct, shipped, Makefile and causes infinite recursion during tests @@ -59,17 +49,6 @@ stdenv.mkDerivation (finalAttrs: { "--without-makefile" ]; - # Disabled tests: - # opt-chdir: ofborg complains about it somehow - # opt-keep-going-indirect: not yet known - # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, - # implicit paths - BROKEN_TESTS = builtins.concatStringsSep " " [ - "opt-chdir" - "opt-keep-going-indirect" - "varmod-localtime" - ]; - buildPhase = '' runHook preBuild @@ -94,6 +73,17 @@ stdenv.mkDerivation (finalAttrs: { ksh ]; + # Disabled tests: + # opt-chdir: ofborg complains about it somehow + # opt-keep-going-indirect: not yet known + # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, + # implicit paths + env.BROKEN_TESTS = builtins.concatStringsSep " " [ + "opt-chdir" + "opt-keep-going-indirect" + "varmod-localtime" + ]; + checkPhase = '' runHook preCheck @@ -104,14 +94,15 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + passthru.tests.bmakeMusl = pkgsMusl.bmake; + + meta = { homepage = "http://www.crufty.net/help/sjg/bmake.html"; description = "Portable version of NetBSD 'make'"; - license = licenses.bsd3; - maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isAarch64; # failure on gnulib-tests }; - - passthru.tests.bmakeMusl = pkgsMusl.bmake; }) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) diff --git a/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff b/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff new file mode 100644 index 00000000000..ab9399920c2 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff @@ -0,0 +1,21 @@ +diff -Naur bmake-old/boot-strap bmake-new/boot-strap +--- bmake-old/boot-strap 2023-06-27 18:02:19.000000000 -0300 ++++ bmake-new/boot-strap 2023-07-23 22:31:02.334720661 -0300 +@@ -413,9 +413,6 @@ + [ -s make-bootstrap.sh ] || op_configure + chmod 755 make-bootstrap.sh || exit 1 + ./make-bootstrap.sh || exit 1 +- case "$op" in +- build) op_test;; +- esac + } + + op_test() { +@@ -434,7 +431,6 @@ + } + + op_install() { +- op_test + case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in + ,$HOST_TARGET/bin,*/$HOST_TARGET) + INSTALL_PREFIX=`dirname $prefix` diff --git a/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch b/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch deleted file mode 100644 index b377292cce2..00000000000 --- a/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- bmake/unit-tests/Makefile.orig 2021-05-30 14:24:38.822484317 +0200 -+++ bmake/unit-tests/Makefile 2021-05-31 13:25:21.645751428 +0200 -@@ -455,7 +455,8 @@ - ENV.varmisc= FROM_ENV=env - ENV.varmisc+= FROM_ENV_BEFORE=env - ENV.varmisc+= FROM_ENV_AFTER=env --ENV.varmod-localtime+= TZ=Europe/Berlin -+# Set absolute path to tz file since musl doesn't support TZDIR -+ENV.varmod-localtime+= TZDIR=${TZDIR} TZ=:${TZDIR}/Europe/Berlin - ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2 - - # Override make flags for some of the tests; default is -k. ---- bmake/unit-tests/varmod-localtime.mk.orig 2021-05-30 14:30:34.397986246 +0200 -+++ bmake/unit-tests/varmod-localtime.mk 2021-05-31 13:24:41.430906606 +0200 -@@ -3,7 +3,7 @@ - # Tests for the :localtime variable modifier, which formats a timestamp - # using strftime(3) in local time. - --.if ${TZ} != "Europe/Berlin" # see unit-tests/Makefile -+.if ${TZ} != ":${TZDIR}/Europe/Berlin" # see unit-tests/Makefile - . error - .endif - diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh index f477a96d57a..a36d024b111 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2086,SC2154,SC2206 + addMakeFlags() { export prefix="$out" export MANDIR="${!outputMan}/share/man" @@ -6,48 +8,40 @@ addMakeFlags() { export STRIP_FLAG= } -preConfigureHooks+=(addMakeFlags) - bmakeBuildPhase() { runHook preBuild local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) echoCmd 'build flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray runHook postBuild } -if [ -z "${dontUseBmakeBuild-}" -a -z "${buildPhase-}" ]; then - buildPhase=bmakeBuildPhase -fi - bmakeCheckPhase() { runHook preCheck if [ -z "${checkTarget:-}" ]; then #TODO(@oxij): should flagsArray influence make -n? if bmake -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then - checkTarget=check + checkTarget="check" elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi if [ -z "${checkTarget:-}" ]; then echo "no test target found in bmake, doing nothing" else - # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" # Old bash empty array hack $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} @@ -56,17 +50,11 @@ bmakeCheckPhase() { echoCmd 'check flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - - unset flagsArray fi runHook postCheck } -if [ -z "${dontUseBmakeCheck-}" -a -z "${checkPhase-}" ]; then - checkPhase=bmakeCheckPhase -fi - bmakeInstallPhase() { runHook preInstall @@ -74,10 +62,9 @@ bmakeInstallPhase() { mkdir -p "$prefix" fi - # shellcheck disable=SC2086 local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" # Old bash empty array hack $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} @@ -86,15 +73,10 @@ bmakeInstallPhase() { echoCmd 'install flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray runHook postInstall } -if [ -z "${dontUseBmakeInstall-}" -a -z "${installPhase-}" ]; then - installPhase=bmakeInstallPhase -fi - bmakeDistPhase() { runHook preDist @@ -103,7 +85,6 @@ bmakeDistPhase() { fi # Old bash empty array hack - # shellcheck disable=SC2086 local flagsArray=( $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} ) @@ -116,13 +97,26 @@ bmakeDistPhase() { # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. - # shellcheck disable=SC2086 cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" fi runHook postDist } -if [ -z "${dontUseBmakeDist-}" -a -z "${distPhase-}" ]; then +preConfigureHooks+=(addMakeFlags) + +if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=bmakeBuildPhase +fi + +if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=bmakeCheckPhase +fi + +if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=bmakeInstallPhase +fi + +if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then distPhase=bmakeDistPhase fi diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 7370aee6f57..9ea57a27f02 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -19,6 +19,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-+ohUOQ9WBER/X0TDklf/qZCm9LhM1I1QRmED4FnkweM="; }; + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = with python3.pkgs; [ bottle colorama @@ -41,6 +45,11 @@ python3.pkgs.buildPythonApplication rec { pyopenssl ]; + pythonRelaxDeps = [ + # This can be removed once conan is updated to 2.0.7+ + "PyYAML" + ]; + nativeCheckInputs = [ git pkg-config diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5c81ba4b426..ff794be099c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -134,9 +134,9 @@ rec { }; gradle_7 = gen { - version = "7.6.1"; + version = "7.6.2"; nativeVersion = "0.22-milestone-24"; - sha256 = "11qz1xjfihnlvsblqqnd49kmvjq86pzqcylj6k1zdvxl4dd60iv1"; + sha256 = "1b7riri2ysr1bvfskmmb8phfx8c2b719kqhf189fvrszw63na6x0"; defaultJava = jdk17; }; diff --git a/pkgs/development/tools/build-managers/knit/default.nix b/pkgs/development/tools/build-managers/knit/default.nix new file mode 100644 index 00000000000..df2898239b7 --- /dev/null +++ b/pkgs/development/tools/build-managers/knit/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "knit"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "knit"; + rev = "v${version}"; + hash = "sha256-zxwEJnQZpOEJhV7jx2ClS3XmMfGBiq8AHR26TOIBJVw="; + }; + + vendorHash = "sha256-+IZFydwchHIMIvYmIgZ0uJKjW4aVBFuj3SQk58I0z/g="; + + subPackages = [ + "cmd/knit" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/zyedidia/knit/info.Version=${version}" + ]; + + meta = with lib; { + description = "A simple and flexible build tool using Lua, similar to make/mk"; + homepage = "https://github.com/zyedidia/knit"; + changelog = "https://github.com/zyedidia/knit/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ DrSensor ]; + }; +} diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 3ae839b7b92..8791fbb37bf 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "d88419f21872d18ed2c34a6a612d133b1ebccea2"; - version = "2023-07-11"; + rev = "474915ff832c29944399fe1823d755dfcd587a5e"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "uP8TJ/LsicrVqFXbn8kJNDHRUB/D/y6VxAkVtldwP5U="; + sha256 = "+hrS2Hyh1mLEQBxZHpf6+uIb5cTYhq8odgvmVms2+G8="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 031d71a7bab..c6fc0bf6912 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.0.1", + "version": "1.0.2", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0n6jlxbfw21ck1qg2xzkrp0p4hlvr21cxfp3p27svp01104n6ig8" + "sha256": "0a1gsrzavflyp6vk7qghb7az9ki1mq4vkncsbjwq0b5hrmy4mxry" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "05rmxi7nwxkvx6as6sbfvrsyll2lp06iq77z22glkkv8y1dd6334" + "sha256": "0six9qcrihshn4sbiyzkbxdnkflqq5az166fdi5wz4rq0l4jj02z" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1vsjp3sdnclx5w4bv1kzkk23q848374phlx3ix0qln04ih821q0l" + "sha256": "1c6dsidgcjscqzknvn1sl66kjvjbg400dxxb9lp134zm2sn8r3r2" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1904f2z3hvkl2rmj0czk5qkw9327zqf5m8i4ad0bzyrri5q7q4ki" + "sha256": "1a35xhkvri5nlk65ms0rwlcgsbl8264j6c60665ds2h9dwph06n7" } } } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e29d6032b4d..df3fbbf4c62 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.1.0"; + version = "16.2.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-tlTmKq1a5hX8G0+7RC1QbWA7YVnoBS5R9QqXljJ4bVg="; + vendorHash = "sha256-sP9lboy1M4+AB1Z0VsX5eNxZ9ckuJBgEPxavAbOSk8g="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-1obA2f/YtOBkgYLJqcHQWbaCezEw7lUXs4OxFiONCm8="; + sha256 = "sha256-gTjGf/WuMoGNvsiWWj3Y7l2MvSzBM12RY/Odolm4fNw="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 174f2e0eae8..18ae7591a7c 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.401.2"; + version = "2.401.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-hr2OCytRB1yZsA1DYDwoWEQL8BHs0Imlx5HQyWTUBoI="; + hash = "sha256-p5igxUgaj/sDINkSH2z0ncV1w2kCjarhek3TmLaeAA0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix new file mode 100644 index 00000000000..d1b3ea7bd66 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, woodpecker-plugin-git +}: + +buildGoModule rec { + pname = "woodpecker-plugin-git"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "woodpecker-ci"; + repo = "plugin-git"; + rev = "refs/tags/${version}"; + hash = "sha256-k9w87zt021F6c4GD8kIpqC2ZjpPBiyvJO80z81TKtnE="; + }; + + vendorHash = "sha256-63Ly/9yIJu2K/DwOfGs9pYU3fokbs2senZkl3MJ1UIY="; + + CGO_ENABLED = "0"; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + # Checks fail because they require network access. + doCheck = false; + + passthru.tests.version = testers.testVersion { package = woodpecker-plugin-git; }; + + meta = with lib; { + description = "Woodpecker plugin for cloning Git repositories."; + homepage = "https://woodpecker-ci.org/"; + changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}"; + license = licenses.asl20; + mainProgram = "plugin-git"; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 715575bec9e..eec37c515f7 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "0.15.8"; - srcHash = "sha256-7CTRx7I47VEKfPvkWhmpyHV3hkeLyHymFMrkyYQ1wl8="; + version = "0.15.11"; + srcHash = "sha256-iDcEkaR1ZvH7Q68sxbwOiP1WKbkiDhCOtkuipbjXHKM="; yarnHash = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc="; in { diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index 2c299d5c555..08f7494ecec 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CmWtQzoY/xY/LZL2swhYtDzPvpVOvKlhUH3plDEHrGI="; + sha256 = "sha256-95q10NQer/KPfBVpabupvm3wuhacnqNG3lXc1pzV3Js="; }; - vendorHash = "sha256-1I18ITgFPpUv0mPrt1biJmQV9qd9HB23zJmnDp5WzkA="; + vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; subPackages = [ "cmd/litefs" ]; diff --git a/pkgs/development/tools/database/sqlboiler-crdb/default.nix b/pkgs/development/tools/database/sqlboiler-crdb/default.nix new file mode 100644 index 00000000000..559c8f27758 --- /dev/null +++ b/pkgs/development/tools/database/sqlboiler-crdb/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "sqlboiler-crbd"; + version = "unstable-2022-06-12"; + + src = fetchFromGitHub { + owner = "glerchundi"; + repo = "sqlboiler-crdb"; + rev = "7b35c4d19c05fdc53d1efdcc074f20ee6b56f340"; + hash = "sha256-RlppCRYP7TlM1z1PiXtEVifNVxQHwLuoBXxgYIpUirE="; + }; + + vendorHash = "sha256-N16GH8ZDyeWWBsaaG4RkJwzAbuQ7E8YjZAgVsfeECo4"; + + doCheck = false; # requires a running testdb + + meta = with lib; { + description = "CockroachDB generator for usage with SQLBoiler"; + homepage = "https://github.com/glerchundi/sqlboiler-crdb/"; + maintainers = with maintainers; [ dgollings ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 66d3dea888a..6179116d0ad 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.16"; + version = "0.18.17"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-Oilz8X2tR90EfYq089NgqApoFtqNxDFs0zyxnOyS/9I="; + hash = "sha256-OnAOomKVUIBTEgHywDSSx+ggqUl/vn/R0JdjOb3lUho="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index b89ab9e98fc..a91723b1fb7 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-K/QAG9mCIHe7PQhex3TntlGYAK9l0bESWk616N97dBs="; + ldflags = [ "-s" "-w" "-X main.gronVersion=${version}" ]; + meta = with lib; { description = "Make JSON greppable!"; longDescription = '' diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index f6760d5938a..0fcdb8ad140 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -7,12 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.6.3"; + version = "1.7.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ZQ5nG6MAMY5Jjvk7vjuZsyzhSSB2T7h1P4mZP2Pu15o="; + hash = "sha256-evxwH9WzNoSmZQ4eyriVfhloX4JCQLp0WNys1m+Q+0Y="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -61,8 +61,10 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" - # Formatting changes with pygments 2.14.0 - "test_create_necessary_directories" + # tomlkit 0.12 changes + "test_no_strict_naming" + "test_project_location_basic_set_first_project" + "test_project_location_complex_set_first_project" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" @@ -71,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Modern, extensible Python project manager"; homepage = "https://hatch.pypa.io/latest/"; - changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history.md#hatch"; + changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history/hatch.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/tools/jaq/Cargo.lock b/pkgs/development/tools/jaq/Cargo.lock deleted file mode 100644 index 9abd8a35a24..00000000000 --- a/pkgs/development/tools/jaq/Cargo.lock +++ /dev/null @@ -1,562 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "ariadne" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1cb2a2046bea8ce5e875551f5772024882de0b540c7f93dfc5d6cf1ca8b030c" -dependencies = [ - "yansi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chumsky" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "clap" -version = "4.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b9970d7505127a162fdaa9b96428d28a479ba78c9ec7550a63a5d9863db682" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "colored_json" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633215cdbb84194508d4c07c08d06e92ee9d489d54e68d17913d8d1bacfcfdeb" -dependencies = [ - "atty", - "serde", - "serde_json", - "yansi", -] - -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "log", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hifijson" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jaq" -version = "0.10.0" -dependencies = [ - "ariadne", - "atty", - "chumsky", - "clap", - "colored_json", - "env_logger", - "hifijson", - "jaq-core", - "jaq-std", - "memmap2", - "mimalloc", - "serde_json", - "tempfile", -] - -[[package]] -name = "jaq-core" -version = "0.10.0" -dependencies = [ - "ahash", - "dyn-clone", - "hifijson", - "indexmap", - "itertools", - "jaq-parse", - "log", - "once_cell", - "regex", - "serde_json", -] - -[[package]] -name = "jaq-parse" -version = "0.10.0" -dependencies = [ - "chumsky", - "serde", -] - -[[package]] -name = "jaq-std" -version = "0.10.0" -dependencies = [ - "bincode", - "jaq-core", - "jaq-parse", - "serde_json", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "mimalloc" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "git+https://github.com/01mf02/regex?rev=90eebbd#90eebbdb9396ca10510130327073a3d596674d04" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index a10697d5bf2..4ee02d0a514 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -1,29 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-v3dC5Qi0Op+oFCcbkbK1ZUQxWTEYVvXsc+ye9Kk9y7c="; + hash = "sha256-P1NWkqRotL8h87iqxdVJhGVy9dw47fXeL10db1xsk00="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "regex-syntax-0.6.28" = "sha256-FltQ1TfA4XV+jC3dQZf7soTHc8R/nSwToPGcQUVwVYs="; - }; - }; + cargoHash = "sha256-ZsY3PwbjNILYR+dYSp1RVqw0QV9PVB5bPSX1RdVUZUg="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "A jq clone focused on correctness, speed and simplicity"; homepage = "https://github.com/01mf02/jaq"; + changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ figsoda siraben ]; }; } diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 926001e8913..5b3be527778 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.109.0"; + version = "0.110.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-r/O9oQ5hzcnnjuZpyJHp7jbxaAF3t4Ef33ovCyMPt10="; + sha256 = "sha256-xxpuvMlfDflXmUkJcTxw3enz27OadebsDWxoP8Ooi1w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix index a20f5886271..2f0907d36b7 100644 --- a/pkgs/development/tools/language-servers/ansible-language-server/default.nix +++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "ansible-language-server"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ansible"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5QzwDsWjuq/gMWFQEkl4sqvsqfxTOZhaFBMhjiiOZSY="; + hash = "sha256-e6cOWoryOxWnl8q62rlGmSgwLVnoxLMwNFoGlUZw2bQ="; }; - npmDepsHash = "sha256-bzffCAGn0aYVoG8IDaXd5I3x3AnGl5urX7BaBKf0tVI="; + npmDepsHash = "sha256-Lzwj0/2fxa44DJBsgDPa43AbRxggqh881X/DFnlNLig="; npmBuildScript = "compile"; # We remove/ignore the prepare and prepack scripts because they run the diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 17dd2019c81..9cf575ec548 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.24"; + version = "3.6.25"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-PjJUoh2wqXUhYNNYIu5PLk3WZoWxBvwf3NA36xEYb2I="; + sha256 = "sha256-fERsqOjuZSIPpTEAQbKZ/ZYzQENxJi8Gibb6Oi073pA="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 44ac46ca3f4..96f0e67abb3 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,11 +28,12 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.7" +version = "0.12.8" dependencies = [ "config", "diagnostic", "elapsed", + "fast-hash", "fmt-util", "input", "mlb-statics", @@ -114,7 +115,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "str-util", @@ -127,7 +128,7 @@ source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e1 [[package]] name = "cm-syntax" -version = "0.12.7" +version = "0.12.8" dependencies = [ "lex-util", "paths", @@ -156,7 +157,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "serde", @@ -184,7 +185,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "once_cell", @@ -411,7 +412,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.7" +version = "0.12.8" dependencies = [ "cm-syntax", "config", @@ -459,7 +460,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.7" +version = "0.12.8" dependencies = [ "analysis", "anyhow", @@ -487,7 +488,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.7" +version = "0.12.8" [[package]] name = "libc" @@ -559,7 +560,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.7" +version = "0.12.8" dependencies = [ "analysis", "codespan-reporting", @@ -577,7 +578,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.7" +version = "0.12.8" dependencies = [ "anyhow", "env_logger", @@ -597,7 +598,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "paths", @@ -608,7 +609,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.7" +version = "0.12.8" dependencies = [ "config", "diagnostic", @@ -632,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.7" +version = "0.12.8" dependencies = [ "lex-util", "paths", @@ -695,7 +696,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.12.7" +version = "0.12.8" dependencies = [ "better-panic", ] @@ -898,7 +899,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "str-util", @@ -906,14 +907,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.7" +version = "0.12.8" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "fmt-util", @@ -924,7 +925,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.7" +version = "0.12.8" dependencies = [ "config", "pretty_assertions", @@ -940,7 +941,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.7" +version = "0.12.8" dependencies = [ "config", "elapsed", @@ -954,7 +955,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "once_cell", @@ -963,7 +964,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.7" +version = "0.12.8" dependencies = [ "la-arena", "sml-lab", @@ -974,7 +975,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.7" +version = "0.12.8" dependencies = [ "config", "cov-mark", @@ -989,14 +990,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.7" +version = "0.12.8" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.7" +version = "0.12.8" dependencies = [ "cov-mark", "diagnostic", @@ -1011,7 +1012,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "sml-comment", @@ -1020,11 +1021,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.7" +version = "0.12.8" [[package]] name = "sml-parse" -version = "0.12.7" +version = "0.12.8" dependencies = [ "diagnostic", "event-parse", @@ -1036,14 +1037,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.7" +version = "0.12.8" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.7" +version = "0.12.8" dependencies = [ "num-bigint", "num-traits", @@ -1052,7 +1053,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.7" +version = "0.12.8" dependencies = [ "chain-map", "config", @@ -1075,7 +1076,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.7" +version = "0.12.8" dependencies = [ "chain-map", "code-h2-md-map", @@ -1094,7 +1095,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.7" +version = "0.12.8" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1102,7 +1103,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.7" +version = "0.12.8" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1113,7 +1114,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.7" +version = "0.12.8" dependencies = [ "fast-hash", "sml-hir", @@ -1171,7 +1172,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.7" +version = "0.12.8" dependencies = [ "analysis", "cm-syntax", @@ -1515,7 +1516,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.7" +version = "0.12.8" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 017474c6927..d28677fc3a8 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-W1Iq9vd7rkqx+0d+BIUnSxLQZG7X6K4JkGKc7zJSEIQ="; + hash = "sha256-H44aQGrLv/A1yo44DaR9FJ0ReXiHU4SQ3zLoEkxF9M8="; }; cargoLock = { diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index aa07359c6cc..f4ccfe90d70 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -3,6 +3,15 @@ version = 3 [[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -34,9 +43,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arrayref" @@ -46,19 +55,30 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -86,6 +106,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -130,6 +165,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -137,9 +178,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" dependencies = [ "serde", ] @@ -169,6 +210,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] +name = "castaway" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + +[[package]] name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -244,6 +291,15 @@ dependencies = [ ] [[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -259,6 +315,55 @@ dependencies = [ ] [[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "csv" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -280,13 +385,43 @@ dependencies = [ ] [[package]] +name = "curl" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi", +] + +[[package]] +name = "curl-sys" +version = "0.4.64+curl-8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f96069f0b1cb1241c838740659a771ef143363f52772a9ce1bd9c04c75eee0dc" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi", +] + +[[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -327,7 +462,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -338,9 +473,9 @@ checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elsa" @@ -360,7 +495,35 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", ] [[package]] @@ -374,6 +537,15 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -399,6 +571,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -474,6 +659,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] name = "futures-macro" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -481,7 +681,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -521,8 +721,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -536,12 +738,33 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "hayagriva" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -570,11 +793,19 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "http" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "libc", + "bytes", + "fnv", + "itoa", ] [[package]] @@ -749,11 +980,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", + "qoi", + "tiff", ] [[package]] @@ -769,7 +1003,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "isahc" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel", + "castaway", + "crossbeam-utils", + "curl", + "curl-sys", + "event-listener", + "futures-lite", + "http", + "log", + "once_cell", + "polling", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", ] [[package]] @@ -792,21 +1076,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -827,10 +1114,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" @@ -839,6 +1132,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] +name = "libz-sys" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121f7402cc6ab5821dad08d1b9d11618a9ea4da992343909fecf8e430e86364c" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -906,14 +1211,23 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180d4b35be83d33392d1d1bfbd2ae1eca7ff5de1a94d3fc87faaa99a069e7cbd" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -924,6 +1238,26 @@ dependencies = [ ] [[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] name = "num-bigint" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -957,9 +1291,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -967,9 +1301,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -982,18 +1316,150 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-http" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906" +dependencies = [ + "async-trait", + "bytes", + "http", + "isahc", + "opentelemetry_api", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08e028dc9f4f304e9320ce38c80e7cf74067415b1ad5a8750a38bae54a4d450d" +dependencies = [ + "async-trait", + "futures", + "futures-executor", + "http", + "isahc", + "once_cell", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "thiserror", + "thrift", + "tokio", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e33428e6bf08c6f7fcea4ddb8e358fab0fe48ab877a87c70c6ebe20f673ce5" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1018,9 +1484,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" @@ -1041,18 +1507,18 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -1065,29 +1531,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1105,6 +1571,12 @@ dependencies = [ ] [[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] name = "png" version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1118,10 +1590,26 @@ dependencies = [ ] [[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] + +[[package]] name = "postcard" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" dependencies = [ "cobs", "serde", @@ -1159,9 +1647,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1176,10 +1664,19 @@ dependencies = [ ] [[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1190,6 +1687,8 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha", "rand_core", ] @@ -1208,6 +1707,31 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "rctree" @@ -1246,13 +1770,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-syntax 0.7.4", ] [[package]] @@ -1263,9 +1799,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resvg" @@ -1313,10 +1849,16 @@ dependencies = [ ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" @@ -1336,9 +1878,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -1350,36 +1892,45 @@ dependencies = [ ] [[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -1388,20 +1939,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -1412,17 +1963,26 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", ] [[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simplecss" @@ -1458,10 +2018,40 @@ dependencies = [ ] [[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel", + "futures-core", + "futures-io", +] + +[[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "stable_deref_trait" @@ -1521,8 +2111,8 @@ checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] name = "svg2pdf" -version = "0.4.1" -source = "git+https://github.com/typst/svg2pdf#35f4bb87fb677473661c6d12919e01a6d64a716d" +version = "0.5.0" +source = "git+https://github.com/typst/svg2pdf#14eb3eb5be2f70d6735c88661387fddf0e110871" dependencies = [ "image", "miniz_oxide", @@ -1553,9 +2143,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1597,29 +2187,72 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float", + "threadpool", +] + +[[package]] +name = "tiff" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "serde", @@ -1635,9 +2268,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -1696,13 +2329,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", + "libc", + "mio", "num_cpus", "pin-project-lite", + "socket2", "tokio-macros", "windows-sys", ] @@ -1715,7 +2352,18 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", ] [[package]] @@ -1734,9 +2382,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -1746,20 +2394,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -1833,6 +2481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -1840,13 +2489,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -1856,6 +2505,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a39dcf9bfc1742fa4d6215253b33a6e474be78275884c216fc2a06267b3600" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", ] [[package]] @@ -1875,7 +2571,7 @@ name = "typst" version = "0.5.0" source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.3", "bytemuck", "comemo", "ecow", @@ -1883,7 +2579,7 @@ dependencies = [ "fontdb", "if_chain", "image", - "indexmap", + "indexmap 1.9.3", "log", "miniz_oxide", "once_cell", @@ -1953,7 +2649,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.7.1" +version = "0.7.2" dependencies = [ "anyhow", "chrono", @@ -1962,11 +2658,13 @@ dependencies = [ "elsa", "futures", "if_chain", - "indexmap", + "indexmap 1.9.3", "itertools", "lazy_static", - "memmap2 0.7.0", + "memmap2 0.7.1", "once_cell", + "opentelemetry", + "opentelemetry-jaeger", "parking_lot", "regex", "same-file", @@ -1976,6 +2674,9 @@ dependencies = [ "strum", "tokio", "tower-lsp", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", "typst", "typst-library", "walkdir", @@ -1989,7 +2690,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -2036,9 +2737,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-math-class" @@ -2098,6 +2799,12 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "usvg" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2164,12 +2871,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" [[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] name = "walkdir" version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2187,9 +2912,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2197,24 +2922,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2222,22 +2947,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "weezl" @@ -2296,9 +3021,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2353,9 +3078,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" dependencies = [ "memchr", ] @@ -2461,3 +3186,12 @@ dependencies = [ "syn 1.0.109", "synstructure", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index bca3371dca8..04c048a956c 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -5,20 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "nvarner"; repo = pname; rev = "v${version}"; - hash = "sha256-to+M/1TcQTeojwVMuXR2moyZ0L3vhGiokJrWustF/go="; + hash = "sha256-z6IG0qJXzwisazR/tLq6dwsZzgzhYKh/NnKmnYySS18="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "elsa-1.8.1" = "sha256-/85IriplPxx24TE/CsvjIsve100QUZiVqS0TWgPFRbw="; - "svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ="; + "svg2pdf-0.5.0" = "sha256-v/ARFI+Uw5KtLe2F3ty9u3uKkWSradRmLnD2VJ+jmSI="; "typst-0.5.0" = "sha256-obUe9OVQ8M7MORudQGN7zaYjUv4zjeh7XidHHmUibTA="; }; }; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "A brand-new language server for Typst"; homepage = "https://github.com/nvarner/typst-lsp"; changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}"; - license = with licenses; [ mit ]; + license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda GaetanLepage ]; }; } diff --git a/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch b/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch index a72c6722a02..a23ee367a79 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch +++ b/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch @@ -1,15 +1,15 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -1873,7 +1873,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" +@@ -2569,7 +2569,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" version = "0.5.0" -source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c" +source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.3", "bytemuck", -@@ -1915,7 +1915,7 @@ dependencies = [ +@@ -2611,7 +2611,7 @@ dependencies = [ [[package]] name = "typst-library" version = "0.5.0" @@ -18,7 +18,7 @@ dependencies = [ "az", "chinese-number", -@@ -1983,7 +1983,7 @@ dependencies = [ +@@ -2685,7 +2685,7 @@ dependencies = [ [[package]] name = "typst-macros" version = "0.5.0" @@ -29,10 +29,10 @@ "proc-macro2", --- a/Cargo.toml +++ b/Cargo.toml -@@ -32,6 +32,6 @@ tokio = { version = "1.26.0", features = [ - "io-std", +@@ -49,6 +49,6 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = + "registry", + "fmt", ] } - tower-lsp = "0.19.0" -typst = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" } -typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" } +typst = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" } diff --git a/pkgs/development/tools/lv_img_conv/default.nix b/pkgs/development/tools/lv_img_conv/default.nix index dc1a4f5ae02..e00b960c46b 100644 --- a/pkgs/development/tools/lv_img_conv/default.nix +++ b/pkgs/development/tools/lv_img_conv/default.nix @@ -52,9 +52,7 @@ buildNpmPackage rec { makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}"; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 8a322533292..d5d72d2c99e 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.0.0"; + version = "4.0.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-Ois5peY2Znj33wg/iVUa2r4U1dRU1R8KKvpptwK+o9w="; + sha256 = "sha256-yCCnEFz6PGhfrbWwo/HVLPr6qrIxvlZhAdIU4XoOjqc="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 9afe362a5dc..d0d69fa2695 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.17.0"; + version = "2.19.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "7s0gh+H/g8QjyLs42mQFuMhTE8kAE96meVijjryBEFs="; + sha256 = "hzHRloC0KSKzXpdheqqqFmjVS6IGXV7r5vo1OiW5Dms="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "yyAcxmM6KF0BUU7glfUoP6ixFX92WDAwu/iGY5ZHUeg="; + sha256 = "GUbSB7MRtiYSvgrW1oBbQhhJg7SkPAWegw6UNxZIG9I="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "SJDjxykt793ZBVbAN0SO4nA7KXbo4ZB4TJarFXkaYxI="; + sha256 = "ayA+vIcSIKjivlJAKoXAfvAt1VIgthipC6SzPD/2dqI="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "pQFseYi2idjCTm+qfyLCTR/sYCIwZIVwYUPnNAtPH78="; + sha256 = "7TTcWHL6JWJAW4faEeGvSYQKEbdibEpQvIH9n96BcTA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "7qq1+P+6nfo3gvWSHU/YnAsEPEPcyJHFANxVcXiz5yA="; + sha256 = "Dk4cSfukFBcnjwATfcQU6R+i2phVsfXMAwFb/iFjFAg="; }; }; diff --git a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/pkgs/development/tools/misc/catppuccin-catwalk/default.nix new file mode 100644 index 00000000000..f0ba4aae74d --- /dev/null +++ b/pkgs/development/tools/misc/catppuccin-catwalk/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, python3 +, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "catppuccin-catwalk"; + version = "0.4.0"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "catppuccin_catwalk"; + hash = "sha256-5TAw5H3soxe9vLhfj1qs8uMr4ybrHlCj4zdsMzvPo6s="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pillow + ]; + + pythonImports = [ + "catwalk" + ]; + + meta = with lib; { + homepage = "https://github.com/catppuccin/toolbox"; + description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once"; + license = licenses.mit; + maintainers = with maintainers; [ ryanccn ]; + }; +} diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index 5dbdaf6c863..a122a2a7ff8 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage { pname = "complgen"; - version = "unstable-2023-07-10"; + version = "unstable-2023-07-20"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; - rev = "6b1fbc50d56061c74e3324362b23ba5211aaff25"; - hash = "sha256-y94DOMW3w+/YJ4uNvEM4y/dZXZuwFPYhDuh2TOyBn8U="; + rev = "18ad7e5def8e9b9701a79511a23a2091baad8a9e"; + hash = "sha256-1nNxcYi7HrA2vcggiLC5UPTX3dmM5xgjubnX7WtCq/A="; }; - cargoHash = "sha256-fzLM1vxY1FBpw/5JDp4+VO9SVfCQCH8Et5a0WTYSHwk="; + cargoHash = "sha256-rR9wj34QUmIn5HE0k2nOa7HHO5DI+w6BbCgJ4Aelt44="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index e3f37ca5ccd..3d0a9855bf9 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -15,17 +15,17 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.63.3"; + version = "1.64.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-PBFBepG7b5M9LKSQOp7+mVhtwSLgQzUTu3i1055uNBk="; + hash = "sha256-JIw1I60Av5hUSRyqhc4nK5x9gHJcHTUIdYBTfQf8ob4="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-ciJUjkItnwzKH6k8a5zxIbARQAEfg/GJEsKfSaygsXU="; + vendorHash = "sha256-kGeQIlNTHhlIEFH4MdWF5smc9lLg4YHx11bZS4BTPgI="; nativeBuildInputs = [ buf diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 129b55e7409..a88bd9f0b3b 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -4,7 +4,7 @@ , fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time -, ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, dejagnu, sourceHighlight +, ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, dejagnu, sourceHighlight, libiconv , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform elfutils, elfutils @@ -57,7 +57,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline gmp mpfr expat libipt zlib zstd guile sourceHighlight ] ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu - ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }); + ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }) + ++ lib.optional stdenv.isDarwin libiconv; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index a675109ce7d..790fbd52b7a 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2023-06-08"; + version = "unstable-2023-07-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "519766900c63f3cf227c9a38fc7aa8a53fc4f90c"; - sha256 = "sha256-NiJr/7kzLN7gnhgbg/12s7E0qe0TJpncQ05zsDLhUFs="; + rev = "c40128936fc804b74abddaa0bc1d8ef6e5dba48e"; + sha256 = "sha256-qX0pGkHeX+KssiATwwohzUlGIZQqpIjKsLv32U2nyWA="; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index 4eb4be4a5ea..3d6f4fb5ad7 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.2.3"; + version = "10.2.6"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-lSNrFsLF5t3vduIUGjlD6L6Ii5R5CU/ViXuSe2dV4X8="; + hash = "sha256-F2YKbAZtWIgwuFIg+wf57LaWPcY5mzYGR7sNDLH9Bb0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 3df3950e2a7..033240878c3 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -2,6 +2,7 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, nodejs , runtimeShell , stdenv , testers @@ -10,21 +11,25 @@ buildGoModule rec { pname = "runme"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-upcwNxCtGFsLQsl4quXiEYX8R9DWrm9tWTwvCw5C4QI="; + hash = "sha256-WxsMANyxV+ibAf0/TnkVExyC8XgBjtO92GHNztM0GiU="; }; - vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI="; + vendorHash = "sha256-gFe4lfe6M8NF1zzqK+jLmQix/311yWhFccLsOn+LOZc="; nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ + nodejs + ]; + subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/samply/default.nix b/pkgs/development/tools/misc/samply/default.nix new file mode 100644 index 00000000000..9d70b9bc14d --- /dev/null +++ b/pkgs/development/tools/misc/samply/default.nix @@ -0,0 +1,55 @@ +{ lib +, rustPlatform +, fetchCrate +, jq +, moreutils +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "samply"; + version = "0.11.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-V0uAS7Oo7wv0yU5CgqqYhltwM5PXJ3GP/TLVZV2GkkI="; + }; + + cargoHash = "sha256-jsuICNVY3noZi/+mgVj9uUu53z+5bW9Vi5CBKcHOqSI="; + + # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, + # which causes a hash mismatch on systems with a case-insensitive filesystem + # this removes the readme files and updates cargo's checksum file accordingly + depsExtraArgs = { + nativeBuildInputs = [ + jq + moreutils + ]; + + postBuild = '' + for crate in linux-perf-data linux-perf-event-reader; do + pushd $name/$crate + + rm -f README.md Readme.md + jq 'del(.files."README.md") | del(.files."Readme.md")' \ + .cargo-checksum.json -c \ + | sponge .cargo-checksum.json + + popd + done + ''; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + meta = with lib; { + description = "A command line profiler for macOS and Linux"; + homepage = "https://github.com/mstange/samply"; + changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index ac60a01a1ae..8a83d056646 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -8,17 +8,18 @@ , zlib , testers , mold +, nix-update-script }: stdenv.mkDerivation rec { pname = "mold"; - version = "1.11.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dfdrXp05eJALTQnx2F3GxRWKMA+Icj0mRPcb72z7qMw="; + hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM="; }; nativeBuildInputs = [ @@ -49,7 +50,10 @@ stdenv.mkDerivation rec { "-faligned-allocation" ]); - passthru.tests.version = testers.testVersion { package = mold; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = mold; }; + }; meta = with lib; { description = "A faster drop-in replacement for existing Unix linkers"; @@ -61,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; - license = licenses.agpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ azahi nitsky ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 24fd8f39312..c282286524e 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-8MPOSfNsczuK7nJhHxB88G3mvEI75yYqqxuz8DwFqHg="; + hash = "sha256-TzrL1F09zbu9qJE3L0PwVpQra5btl37FKBupqHUTSt8="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 08dfc02cbd1..bf1787e23ae 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "17.12.0"; + version = "18.1.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-evZ8o6KMbnhVGY7gGicvs5hYxxHGxfkGAtcZPQd0Bvc="; + hash = "sha256-qK9hjsWhVTzxFo4SSvKb5IgZteVabWlCtoetu9v9xIE="; }; - vendorHash = "sha256-sdUvtp/qXneP1z2MnV2XNGbBV/LXgAug5ueO83foNCA="; + vendorHash = "sha256-cATGMi/nL8dvlsR+cuvKH6Y9eR3UqcVjvZAj35Ydn2c="; sourceRoot = "source/src"; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 314e921408c..dd5c8dd40ec 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.16.5"; + version = "2.18.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-K3GkdcUNaBTo5sMfLONQ2o7SYUNMJ45WA5FQQ3+0+RY="; + hash = "sha256-u0Ue5padTT2hPEta0ysm7W2oR1/FMFyTZd9yuciCehU="; }; - vendorHash = "sha256-aNXKRP7WFzscDPjZmDTbgKItNEQrRpsq+XiOuggx85w="; + vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix index fbf28163460..e11baa783ba 100644 --- a/pkgs/development/tools/pifpaf/default.nix +++ b/pkgs/development/tools/pifpaf/default.nix @@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ requests + testtools ]; pythonImportsCheck = [ "pifpaf" ]; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index a7d7d8c8c58..b68a8908d18 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.6.0"; + version = "2.6.1"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ja3LPKfrqs1evNzjOJ3oxh2vxqw8oZJDIsyZGT0q3PY="; + hash = "sha256-bB3yaQweXyj4O2TMHBhyMz5tm2Th0cDqRZ1B9lv+ARk="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 7ff94299afc..05539f66586 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pprof"; - version = "unstable-2022-05-09"; + version = "unstable-2023-07-05"; src = fetchFromGitHub { owner = "google"; repo = "pprof"; - rev = "59ca7ad80af3faf4f87f4d82ff02f5d390c08ed6"; - sha256 = "0jni73ila3glg7rl11v0al947d94dd0syhkjqnliaryh8dkxbx80"; + rev = "200ffdc848b879f8aff937ffeba601c186916257"; + hash = "sha256-/Y1Tj9z+2MNe+b2vzd4F+PwHGSbCYP7HpbaDUL9ZzKQ="; }; - vendorSha256 = "0vr8jp3kxgadb73g67plfrl5dkxfwrxaxjs664918jssy25vyk2y"; + vendorHash = "sha256-MuejFoK49VMmLt7xsiX/4Av7TijPwM9/mewXlfdufd8="; meta = with lib; { description = "A tool for visualization and analysis of profiling data"; diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index 2aabe3bcce6..92119740752 100644 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -2,16 +2,17 @@ buildGoModule { pname = "protoc-gen-twirp_typescript"; - version = "unstable-2021-03-29"; + version = "unstable-2022-08-14"; src = fetchFromGitHub { owner = "larrymyers"; repo = "protoc-gen-twirp_typescript"; - rev = "97fd63e543beb2d9f6a90ff894981affe0f2faf1"; + rev = "535986b31881a214db3c04f122bcc96a2823a155"; sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + proxyVendor = true; + vendorSha256 = "sha256-UyxHa28SY60U8VeL7TbSTyscqN5T7tKGfuN2GIL6QIg"; subPackages = [ "." ]; @@ -19,6 +20,6 @@ buildGoModule { description = "Protobuf Plugin for Generating a Twirp Typescript Client"; homepage = "https://github.com/larrymyers/protoc-gen-twirp_typescript"; license = licenses.mit; - maintainers = with maintainers; [ jojosch ]; + maintainers = with maintainers; [ jojosch dgollings ]; }; } diff --git a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch deleted file mode 100644 index f0e8c3d2c5e..00000000000 --- a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp -index b656f8e1..a830d3c3 100644 ---- a/src/plugins/cpptools/headerpathfilter.cpp -+++ b/src/plugins/cpptools/headerpathfilter.cpp -@@ -124,8 +124,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths) - { - // include/c++, include/g++, libc++\include and libc++abi\include - static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))" -- R"(|(.*libc\+\+/include))" -- R"(|(.*libc\+\+abi/include))" -+ R"(|(.*libc\+\+.*\/include))" -+ R"(|(.*libc\+\+abi.*\/include))"; - R"(|(/usr/local/include))"; - static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z"); - diff --git a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch b/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch deleted file mode 100644 index b0427e94c7c..00000000000 --- a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp -index a830d3c3..80e2f933 100644 ---- a/src/plugins/cpptools/headerpathfilter.cpp -+++ b/src/plugins/cpptools/headerpathfilter.cpp -@@ -157,7 +157,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths) - - void HeaderPathFilter::tweakHeaderPaths() - { -- removeClangSystemHeaderPaths(builtInHeaderPaths); - removeGccInternalIncludePaths(); - - auto split = resourceIterator(builtInHeaderPaths); diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 5072bb88f4b..61413e55439 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -1,96 +1,104 @@ -{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch -, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8, elfutils, perf -, withDocumentation ? false, withClangPlugins ? true +{ stdenv +, lib +, fetchurl +, cmake +, pkg-config +, ninja +, python3 +, qtbase +, qt5compat +, qtdeclarative +, qtdoc +, qtquick3d +, qtquicktimeline +, qtserialport +, qtsvg +, qttools +, qtwebengine +, qtwayland +, qtshadertools +, wrapQtAppsHook +, yaml-cpp +, litehtml +, gumbo +, llvmPackages +, rustc-demangle +, elfutils +, perf }: -let - # Fetch clang from qt vendor, this contains submodules like this: - # clang<-clang-tools-extra<-clazy. - clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { - # file RPATH_CHANGE could not write new RPATH - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - src = fetchgit { - url = "https://code.qt.io/clang/clang.git"; - rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; - sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0"; - }; - unpackPhase = ""; - }); -in - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qtcreator"; - version = "5.0.3"; - baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); + version = "11.0.0"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1sz21ijzvhf5avblikffykbqa8zdq3sbg32g2dmyxv5w211v3lvz"; + url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA="; }; - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++ - lib.optionals withClangPlugins [ llvmPackages_8.libclang - clang_qt_vendor - llvmPackages_8.llvm ]; - - nativeBuildInputs = [ qmake ]; - - # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to - # find clang libc++ library include paths. By default it's not covering paths - # like libc++-version, which is default name for libc++ folder in nixos. - # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not - # remove system clang include paths. - patches = [ ./0001-Fix-clang-libcpp-regexp.patch - ./0002-Dont-remove-clang-header-paths.patch ]; - - doCheck = true; - - buildFlags = lib.optional withDocumentation "docs"; + nativeBuildInputs = [ + cmake + pkg-config + (qttools.override { withClang = true; }) + wrapQtAppsHook + python3 + ninja + ]; - installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs"; + buildInputs = [ + qtbase + qtdoc + qtsvg + qtquick3d + qtwebengine + qtwayland + qtserialport + qtshadertools + qt5compat + qtdeclarative + qtquicktimeline + yaml-cpp + litehtml + gumbo + llvmPackages.libclang + llvmPackages.llvm + rustc-demangle + elfutils + ]; - qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ]; + cmakeFlags = [ + # workaround for missing CMAKE_INSTALL_DATAROOTDIR + # in pkgs/development/tools/build-managers/cmake/setup-hook.sh + "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" + # qtdeclarative in nixpkgs does not provide qmlsc + # fix can't find Qt6QmlCompilerPlusPrivate + "-DQT_NO_FIND_QMLSC=TRUE" + "-DWITH_DOCS=ON" + "-DBUILD_DEVELOPER_DOCS=ON" + "-DBUILD_QBS=OFF" + "-DQTC_CLANG_BUILDMODE_MATCH=ON" + "-DCLANGTOOLING_LINK_CLANG_DYLIB=ON" + ]; - 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' - '' + lib.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 paths to libclang library. - substituteInPlace src/shared/clang/clang_installation.pri \ - --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang.lib}/lib' \ - --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang' \ - --replace 'LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}' 'LIBTOOLING_LIBS = -L${clang_qt_vendor}/lib' \ - --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' - ''; - - preBuild = lib.optionalString withDocumentation '' - ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share - ''; + qtWrapperArgs = [ + "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" + ]; postInstall = '' - mkdir -p $out/share/applications - cp share/applications/org.qt-project.qtcreator.desktop $out/share/applications substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" ''; - meta = { + meta = with lib; { description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; - license = "LGPL"; - maintainers = [ lib.maintainers.akaWolf ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + homepage = "https://wiki.qt.io/Qt_Creator"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.rewine ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix deleted file mode 100644 index 61413e55439..00000000000 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv -, lib -, fetchurl -, cmake -, pkg-config -, ninja -, python3 -, qtbase -, qt5compat -, qtdeclarative -, qtdoc -, qtquick3d -, qtquicktimeline -, qtserialport -, qtsvg -, qttools -, qtwebengine -, qtwayland -, qtshadertools -, wrapQtAppsHook -, yaml-cpp -, litehtml -, gumbo -, llvmPackages -, rustc-demangle -, elfutils -, perf -}: - -stdenv.mkDerivation rec { - pname = "qtcreator"; - version = "11.0.0"; - - src = fetchurl { - url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - (qttools.override { withClang = true; }) - wrapQtAppsHook - python3 - ninja - ]; - - buildInputs = [ - qtbase - qtdoc - qtsvg - qtquick3d - qtwebengine - qtwayland - qtserialport - qtshadertools - qt5compat - qtdeclarative - qtquicktimeline - yaml-cpp - litehtml - gumbo - llvmPackages.libclang - llvmPackages.llvm - rustc-demangle - elfutils - ]; - - cmakeFlags = [ - # workaround for missing CMAKE_INSTALL_DATAROOTDIR - # in pkgs/development/tools/build-managers/cmake/setup-hook.sh - "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" - # qtdeclarative in nixpkgs does not provide qmlsc - # fix can't find Qt6QmlCompilerPlusPrivate - "-DQT_NO_FIND_QMLSC=TRUE" - "-DWITH_DOCS=ON" - "-DBUILD_DEVELOPER_DOCS=ON" - "-DBUILD_QBS=OFF" - "-DQTC_CLANG_BUILDMODE_MATCH=ON" - "-DCLANGTOOLING_LINK_CLANG_DYLIB=ON" - ]; - - qtWrapperArgs = [ - "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" - ]; - - postInstall = '' - substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ - --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" - ''; - - meta = with lib; { - description = "Cross-platform IDE tailored to the needs of Qt developers"; - longDescription = '' - Qt Creator is a cross-platform IDE (integrated development environment) - tailored to the needs of Qt developers. It includes features such as an - advanced code editor, a visual debugger and a GUI designer. - ''; - homepage = "https://wiki.qt.io/Qt_Creator"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.rewine ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 15f5b05a131..f1a4338fcca 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-TzkJupn2oy7zUZybAuTnXZXVLSe72GM7XByo0Kd66Qs="; + sha256 = "sha256-jymn3xqFwAKskBivkm9s/pLkPLpX1haQhNuH18xgiYw="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/tools/rust/cargo-component/Cargo.lock b/pkgs/development/tools/rust/cargo-component/Cargo.lock index 1d35a599e8c..78bd6c46917 100644 --- a/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -30,27 +30,6 @@ dependencies = [ ] [[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] name = "aho-corasick" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -110,7 +89,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -120,32 +99,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -168,9 +135,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -186,7 +153,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -247,7 +214,7 @@ dependencies = [ "futures-lite", "rustix 0.37.23", "signal-hook", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -258,7 +225,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -269,13 +236,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -292,9 +259,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" dependencies = [ "async-trait", "axum-core", @@ -343,14 +310,14 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" +checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -411,15 +378,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - -[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -454,7 +412,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -471,15 +429,6 @@ dependencies = [ ] [[package]] -name = "btoi" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" -dependencies = [ - "num-traits", -] - -[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -498,78 +447,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] -name = "bytesize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] -name = "cargo" -version = "0.71.0" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359c6dff8d490c19dc5202655e184e25835b286300d7547b98e3ba2d6fa183c" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ - "anyhow", - "base64 0.21.2", - "bytesize", - "cargo-platform", - "cargo-util", - "clap", - "crates-io", - "curl", - "curl-sys", - "env_logger", - "filetime", - "flate2", - "fwdansi", - "git2", - "git2-curl", - "gix", - "gix-features", - "glob", - "hex", - "hmac", - "home", - "http-auth", - "humantime", - "ignore", - "im-rc", - "indexmap 1.9.3", - "is-terminal", - "itertools", - "jobserver", - "lazy_static", - "lazycell", - "libc", - "libgit2-sys", - "log", - "memchr", - "opener", - "os_info", - "pasetors", - "pathdiff", - "rand", - "rustc-workspace-hack", - "rustfix", - "semver", "serde", - "serde-value", - "serde_ignored", - "serde_json", - "sha1", - "shell-escape", - "strip-ansi-escapes", - "tar", - "tempfile", - "termcolor", - "time", - "toml", - "toml_edit", - "unicode-width", - "unicode-xid", - "url", - "walkdir", - "windows-sys 0.45.0", ] [[package]] @@ -578,19 +461,17 @@ version = "0.1.0" dependencies = [ "anyhow", "assert_cmd", - "async-trait", "bytes", - "cargo", - "cargo-util", + "cargo-component-core", + "cargo_metadata", "clap", "futures", "heck", - "hex", - "home", - "indexmap 1.9.3", - "keyring", + "indexmap 2.0.0", + "libc", "log", "p256", + "parse_arg", "predicates", "pretty_env_logger", "rand_core", @@ -598,7 +479,6 @@ dependencies = [ "semver", "serde", "serde_json", - "termcolor", "tokio", "tokio-util", "toml_edit", @@ -607,45 +487,80 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-server", - "wasm-metadata", - "wasmparser", + "wasm-metadata 0.10.1", + "wasmparser 0.110.0", "wat", - "wit-bindgen-core", - "wit-bindgen-rust", "wit-bindgen-rust-lib", - "wit-component", + "wit-component 0.13.1", "wit-parser", ] [[package]] +name = "cargo-component-bindings" +version = "0.1.0" +dependencies = [ + "cargo-component-macro", + "wit-bindgen", +] + +[[package]] +name = "cargo-component-core" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures", + "indexmap 2.0.0", + "keyring", + "libc", + "log", + "owo-colors", + "semver", + "serde", + "tokio", + "toml_edit", + "unicode-width", + "url", + "warg-client", + "warg-crypto", + "warg-protocol", + "windows-sys", + "wit-component 0.13.1", + "wit-parser", +] + +[[package]] +name = "cargo-component-macro" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "wit-bindgen-core", + "wit-bindgen-rust", + "wit-component 0.13.1", +] + +[[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] [[package]] -name = "cargo-util" -version = "0.2.4" +name = "cargo_metadata" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e2320a2b1242f9181a3347ae0884bb497e1853d299da99780fa1e96f9abe23" +checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" dependencies = [ - "anyhow", - "core-foundation", - "filetime", - "hex", - "jobserver", - "libc", - "log", - "miow", - "same-file", - "sha2", - "shell-escape", - "tempfile", - "walkdir", - "windows-sys 0.45.0", + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -653,9 +568,6 @@ name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] [[package]] name = "cfg-if" @@ -687,9 +599,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -698,9 +610,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -710,14 +622,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -727,12 +639,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "clru" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" - -[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -749,9 +655,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" [[package]] name = "core-foundation" @@ -779,39 +685,6 @@ dependencies = [ ] [[package]] -name = "crates-io" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9973744e6d1f35e47df29ad99f9bb6a8270e8feaea79c5a5f1febb4c99f1b" -dependencies = [ - "anyhow", - "curl", - "percent-encoding", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-utils" version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -843,47 +716,10 @@ dependencies = [ ] [[package]] -name = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.63+curl-8.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -891,27 +727,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -956,31 +792,11 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -992,7 +808,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1002,16 +818,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der", "digest", @@ -1022,19 +832,10 @@ dependencies = [ ] [[package]] -name = "ed25519-compact" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" -dependencies = [ - "getrandom", -] - -[[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1048,7 +849,6 @@ dependencies = [ "ff", "generic-array", "group", - "hkdf", "pem-rfc7468", "pkcs8", "rand_core", @@ -1084,7 +884,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -1102,9 +902,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1114,7 +914,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1143,6 +943,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "ff" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1153,41 +959,12 @@ dependencies = [ ] [[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - -[[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - -[[package]] name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1280,7 +1057,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1297,7 +1074,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -1331,16 +1108,6 @@ dependencies = [ ] [[package]] -name = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - -[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1358,10 +1125,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1371,605 +1136,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] -name = "git2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "git2-curl" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" -dependencies = [ - "curl", - "git2", - "log", - "url", -] - -[[package]] -name = "gix" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0" -dependencies = [ - "gix-actor", - "gix-attributes", - "gix-config", - "gix-credentials", - "gix-date", - "gix-diff", - "gix-discover", - "gix-features", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-index", - "gix-lock", - "gix-mailmap", - "gix-object", - "gix-odb", - "gix-pack", - "gix-path", - "gix-prompt", - "gix-protocol", - "gix-ref", - "gix-refspec", - "gix-revision", - "gix-sec", - "gix-tempfile", - "gix-transport", - "gix-traverse", - "gix-url", - "gix-validate", - "gix-worktree", - "log", - "once_cell", - "prodash", - "signal-hook", - "smallvec", - "thiserror", - "unicode-normalization", -] - -[[package]] -name = "gix-actor" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf" -dependencies = [ - "bstr", - "btoi", - "gix-date", - "itoa", - "nom", - "thiserror", -] - -[[package]] -name = "gix-attributes" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1" -dependencies = [ - "bstr", - "gix-features", - "gix-glob", - "gix-path", - "gix-quote", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-bitmap" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-chunk" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-command" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb" -dependencies = [ - "bstr", -] - -[[package]] -name = "gix-config" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1" -dependencies = [ - "bstr", - "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", - "gix-ref", - "gix-sec", - "memchr", - "nom", - "once_cell", - "smallvec", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-config-value" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" -dependencies = [ - "bitflags 1.3.2", - "bstr", - "gix-path", - "libc", - "thiserror", -] - -[[package]] -name = "gix-credentials" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b" -dependencies = [ - "bstr", - "gix-command", - "gix-config-value", - "gix-path", - "gix-prompt", - "gix-sec", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-date" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" -dependencies = [ - "bstr", - "itoa", - "thiserror", - "time", -] - -[[package]] -name = "gix-diff" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103a0fa79b0d438f5ecb662502f052e530ace4fe1fe8e1c83c0c6da76d728e67" -dependencies = [ - "gix-hash", - "gix-object", - "imara-diff", - "thiserror", -] - -[[package]] -name = "gix-discover" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350" -dependencies = [ - "bstr", - "dunce", - "gix-hash", - "gix-path", - "gix-ref", - "gix-sec", - "thiserror", -] - -[[package]] -name = "gix-features" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" -dependencies = [ - "bytes", - "crc32fast", - "crossbeam-channel", - "flate2", - "gix-hash", - "libc", - "once_cell", - "parking_lot", - "prodash", - "sha1_smol", - "thiserror", - "walkdir", -] - -[[package]] -name = "gix-glob" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" -dependencies = [ - "bitflags 1.3.2", - "bstr", -] - -[[package]] -name = "gix-hash" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7" -dependencies = [ - "hex", - "thiserror", -] - -[[package]] -name = "gix-hashtable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e55e40dfd694884f0eb78796c5bddcf2f8b295dace47039099dd7e76534973" -dependencies = [ - "gix-hash", - "hashbrown 0.13.2", - "parking_lot", -] - -[[package]] -name = "gix-index" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616" -dependencies = [ - "bitflags 1.3.2", - "bstr", - "btoi", - "filetime", - "gix-bitmap", - "gix-features", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "itoa", - "memmap2", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-lock" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e" -dependencies = [ - "fastrand", - "gix-tempfile", - "thiserror", -] - -[[package]] -name = "gix-mailmap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a" -dependencies = [ - "bstr", - "gix-actor", - "thiserror", -] - -[[package]] -name = "gix-object" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017" -dependencies = [ - "bstr", - "btoi", - "gix-actor", - "gix-features", - "gix-hash", - "gix-validate", - "hex", - "itoa", - "nom", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-odb" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80" -dependencies = [ - "arc-swap", - "gix-features", - "gix-hash", - "gix-object", - "gix-pack", - "gix-path", - "gix-quote", - "parking_lot", - "tempfile", - "thiserror", -] - -[[package]] -name = "gix-pack" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775" -dependencies = [ - "clru", - "gix-chunk", - "gix-diff", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-traverse", - "memmap2", - "parking_lot", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-packetline" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63e5e5a9a92d4fc6b63ff9d94954d25c779ce25c98d5bbe2e4399aa42f7073c" -dependencies = [ - "bstr", - "hex", - "thiserror", -] - -[[package]] -name = "gix-path" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-prompt" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3034d4d935aef2c7bf719aaa54b88c520e82413118d886ae880a31d5bdee57" -dependencies = [ - "gix-command", - "gix-config-value", - "nix", - "parking_lot", - "thiserror", -] - -[[package]] -name = "gix-protocol" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d372ab11d5d28ac21800e3f1a6603a67c1ead57f6f5fab07e1e73e960f331c1" -dependencies = [ - "bstr", - "btoi", - "gix-credentials", - "gix-features", - "gix-hash", - "gix-transport", - "maybe-async", - "nom", - "thiserror", -] - -[[package]] -name = "gix-quote" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40" -dependencies = [ - "bstr", - "btoi", - "thiserror", -] - -[[package]] -name = "gix-ref" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632" -dependencies = [ - "gix-actor", - "gix-features", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-validate", - "memmap2", - "nom", - "thiserror", -] - -[[package]] -name = "gix-refspec" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65" -dependencies = [ - "bstr", - "gix-hash", - "gix-revision", - "gix-validate", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-revision" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6f6ff53f888858afc24bf12628446a14279ceec148df6194481f306f553ad2" -dependencies = [ - "bstr", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-sec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" -dependencies = [ - "bitflags 1.3.2", - "dirs 4.0.0", - "gix-path", - "libc", - "windows 0.43.0", -] - -[[package]] -name = "gix-tempfile" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31" -dependencies = [ - "libc", - "once_cell", - "parking_lot", - "signal-hook", - "signal-hook-registry", - "tempfile", -] - -[[package]] -name = "gix-transport" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d633947b36a2fbbc089195bdc71621158f1660c2ff2a6b12b0279c16e2f764bc" -dependencies = [ - "base64 0.21.2", - "bstr", - "curl", - "gix-command", - "gix-credentials", - "gix-features", - "gix-packetline", - "gix-quote", - "gix-sec", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-traverse" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3" -dependencies = [ - "gix-hash", - "gix-hashtable", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-url" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528" -dependencies = [ - "bstr", - "gix-features", - "gix-path", - "home", - "thiserror", - "url", -] - -[[package]] -name = "gix-validate" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-worktree" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb" -dependencies = [ - "bstr", - "gix-attributes", - "gix-features", - "gix-glob", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "io-close", - "thiserror", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2007,12 +1173,6 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - -[[package]] -name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" @@ -2082,15 +1242,6 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2102,15 +1253,6 @@ dependencies = [ ] [[package]] -name = "http-auth" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5430cacd7a1f9a02fbeb350dfc81a0e5ed42d81f3398cb0ba184017f85bdcfbc" -dependencies = [ - "memchr", -] - -[[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2123,9 +1265,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -2193,7 +1335,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows", ] [[package]] @@ -2228,47 +1370,6 @@ dependencies = [ ] [[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "im-rc" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -dependencies = [ - "bitmaps", - "rand_core", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "imara-diff" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" -dependencies = [ - "ahash", - "hashbrown 0.12.3", -] - -[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2287,6 +1388,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -2299,16 +1401,6 @@ dependencies = [ ] [[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - -[[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2316,7 +1408,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2327,13 +1419,13 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.3", - "windows-sys 0.48.0", + "rustix 0.38.4", + "windows-sys", ] [[package]] @@ -2346,19 +1438,19 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.8" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] [[package]] -name = "jobserver" -version = "0.1.26" +name = "itoa" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" @@ -2371,9 +1463,9 @@ dependencies = [ [[package]] name = "keyring" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ac4b8b0884cdf23c4619d139acf43839eac4f0739b92980c2a6d460d9c84f5" +checksum = "9549a129bd08149e0a71b2d1ce2729780d47127991bfd0a78cc1df697ec72492" dependencies = [ "byteorder", "lazy_static", @@ -2390,12 +1482,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] name = "leb128" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2408,56 +1494,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] -name = "libgit2-sys" -version = "0.15.2+1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libnghttp2-sys" -version = "0.1.7+1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] name = "linux-keyutils" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2515,7 +1551,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -2534,32 +1570,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] -name = "maybe-async" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] name = "memoffset" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2570,9 +1586,9 @@ dependencies = [ [[package]] name = "miette" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a236ff270093b0b67451bc50a509bd1bad302cb1d3c7d37d5efe931238581fa9" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "miette-derive", "once_cell", @@ -2582,13 +1598,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -2608,12 +1624,6 @@ dependencies = [ ] [[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2630,16 +1640,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2680,16 +1681,6 @@ dependencies = [ ] [[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] name = "normalize-line-endings" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2701,7 +1692,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2716,9 +1707,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -2783,9 +1774,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -2801,15 +1792,6 @@ dependencies = [ ] [[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] name = "object" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2831,16 +1813,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "opener" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" -dependencies = [ - "bstr", - "winapi", -] - -[[package]] name = "openssl" version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2863,7 +1835,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -2891,15 +1863,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - -[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2910,50 +1873,22 @@ dependencies = [ ] [[package]] -name = "orion" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" -dependencies = [ - "fiat-crypto", - "subtle", - "zeroize", -] - -[[package]] -name = "os_info" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "p256" -version = "0.13.2" +name = "owo-colors" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] -name = "p384" -version = "0.13.0" +name = "p256" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ "ecdsa", "elliptic-curve", @@ -2987,29 +1922,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] -name = "pasetors" -version = "0.6.7" +name = "parse_arg" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" -dependencies = [ - "ct-codecs", - "ed25519-compact", - "getrandom", - "orion", - "p384", - "rand_core", - "regex", - "serde", - "serde_json", - "sha2", - "subtle", - "time", - "zeroize", -] +checksum = "14248cc8eced350e20122a291613de29e4fa129ba2731818c4cdbb44fccd3e55" [[package]] name = "pathdiff" @@ -3034,7 +1954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24" dependencies = [ "heck", - "itertools", + "itertools 0.10.5", "prost", "prost-types", ] @@ -3096,7 +2016,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -3140,7 +2060,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3158,7 +2078,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -3221,23 +2141,14 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] -name = "prodash" -version = "23.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d" -dependencies = [ - "parking_lot", -] - -[[package]] name = "prost" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3255,7 +2166,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -3276,7 +2187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -3306,9 +2217,9 @@ dependencies = [ [[package]] name = "protox" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24022a7eb88547eaba87a1db7954c9c4cb4a143565c4e8f2b7f3e76eed63db2d" +checksum = "06a5aacd1f6147ceac5e3896e0c766187dc6a9645f3b93ec821fabbaf821b887" dependencies = [ "bytes", "miette", @@ -3321,9 +2232,9 @@ dependencies = [ [[package]] name = "protox-parse" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a2a651fa4466e67df6c967df5d7fc6cbffac89afc7b834f97ec49846c9c11" +checksum = "30fc6d0af2dec2c39da31eb02cc78cbc05b843b04f30ad78ccc6e8a342ec5518" dependencies = [ "logos", "miette", @@ -3333,9 +2244,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ "bitflags 1.3.2", "memchr", @@ -3344,9 +2255,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3382,15 +2293,6 @@ dependencies = [ ] [[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core", -] - -[[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3421,25 +2323,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] name = "regex-automata" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] @@ -3450,9 +2352,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -3531,24 +2433,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "rustc-workspace-hack" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" - -[[package]] -name = "rustfix" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481" -dependencies = [ - "anyhow", - "log", - "serde", - "serde_json", -] - -[[package]] name = "rustix" version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3559,33 +2443,33 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustix" -version = "0.38.3" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.3.3", "errno", "libc", "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -3602,20 +2486,20 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -3655,9 +2539,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3668,9 +2552,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3678,57 +2562,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] [[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", -] - -[[package]] -name = "serde_ignored" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de9d103529a9ba50008099785839df1e6f40b4576ed4c000cbfdb051182b827" -dependencies = [ - "serde", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -3737,9 +2602,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc4422959dd87a76cb117c191dcbffc20467f06c9100b76721dab370f24d3a" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ "itoa", "serde", @@ -3747,13 +2612,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -3779,9 +2644,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" dependencies = [ "base64 0.21.2", "chrono", @@ -3795,14 +2660,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -3817,12 +2682,6 @@ dependencies = [ ] [[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] name = "sha2" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3843,16 +2702,10 @@ dependencies = [ ] [[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3878,16 +2731,6 @@ dependencies = [ ] [[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3913,6 +2756,15 @@ dependencies = [ ] [[package]] +name = "spdx" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b19b32ed6d899ab23174302ff105c1577e45a06b08d4fe0a9dd13ce804bbbf71" +dependencies = [ + "smallvec", +] + +[[package]] name = "spki" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3929,15 +2781,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "strip-ansi-escapes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" -dependencies = [ - "vte", -] - -[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3962,9 +2805,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -3978,27 +2821,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", -] - -[[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.23", - "windows-sys 0.48.0", + "rustix 0.38.4", + "windows-sys", ] [[package]] @@ -4018,22 +2850,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -4048,13 +2880,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", - "libc", - "num_threads", "serde", "time-core", "time-macros", @@ -4068,9 +2898,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -4107,7 +2937,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4118,7 +2948,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -4168,9 +2998,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.12" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -4197,9 +3027,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ "bitflags 2.3.3", "bytes", @@ -4253,7 +3083,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -4329,16 +3159,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] -name = "unicode-bom" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32" - -[[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4404,27 +3228,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] name = "wait-timeout" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4461,8 +3264,9 @@ dependencies = [ [[package]] name = "warg-api" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ + "itertools 0.11.0", "serde", "serde_with", "thiserror", @@ -4473,15 +3277,15 @@ dependencies = [ [[package]] name = "warg-client" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "async-trait", "bytes", "clap", - "dirs 5.0.1", + "dirs", "futures-util", - "itertools", + "itertools 0.11.0", "libc", "normpath", "once_cell", @@ -4500,13 +3304,13 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-transparency", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "warg-crypto" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "base64 0.21.2", @@ -4526,7 +3330,7 @@ dependencies = [ [[package]] name = "warg-protobuf" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "pbjson", @@ -4544,12 +3348,12 @@ dependencies = [ [[package]] name = "warg-protocol" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "base64 0.21.2", "hex", - "indexmap 1.9.3", + "indexmap 2.0.0", "pbjson-types", "prost", "prost-types", @@ -4560,25 +3364,27 @@ dependencies = [ "warg-crypto", "warg-protobuf", "warg-transparency", - "wasmparser", + "wasmparser 0.108.0", ] [[package]] name = "warg-server" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "axum", "bytes", "clap", "futures", - "indexmap 1.9.3", + "indexmap 2.0.0", + "secrecy", "serde", "tempfile", "thiserror", "tokio", "tokio-util", + "toml", "tower", "tower-http", "tracing", @@ -4588,19 +3394,16 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-transparency", - "wasmparser", + "wasmparser 0.108.0", ] [[package]] name = "warg-transparency" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", - "pbjson-build", "prost", - "prost-build", - "regex", "thiserror", "warg-crypto", "warg-protobuf", @@ -4633,7 +3436,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", "wasm-bindgen-shared", ] @@ -4667,7 +3470,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4680,24 +3483,50 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "b2f8e9778e04cbf44f58acc301372577375a666b966c50b03ef46144f80436a8" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-encoder" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e5156581ff4a302405c44ca7c85347563ca431d15f1a773f12c9c7b9a6cdc9" +checksum = "d51db59397fc650b5f2fc778e4a5c4456cd856bed7fc1ec15f8d3e28229dc463" dependencies = [ "anyhow", - "indexmap 1.9.3", + "indexmap 2.0.0", "serde", - "wasm-encoder", - "wasmparser", + "serde_json", + "spdx", + "wasm-encoder 0.30.0", + "wasmparser 0.108.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be44e148f09a188971ec512250b3ae136029e2df586dd740586ce76a17ee657d" +dependencies = [ + "anyhow", + "indexmap 2.0.0", + "serde", + "serde_json", + "spdx", + "wasm-encoder 0.31.1", + "wasmparser 0.110.0", ] [[package]] @@ -4715,31 +3544,41 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.107.0" +version = "0.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +checksum = "76c956109dcb41436a39391139d9b6e2d0a5e0b158e1293ef352ec977e5e36c5" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +dependencies = [ + "indexmap 2.0.0", "semver", ] [[package]] name = "wast" -version = "60.0.0" +version = "62.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad" +checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.31.1", ] [[package]] name = "wat" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b" +checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637" dependencies = [ "wast", ] @@ -4798,50 +3637,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -4850,22 +3650,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] @@ -4874,104 +3659,62 @@ version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" dependencies = [ "memchr", ] @@ -4986,64 +3729,105 @@ dependencies = [ ] [[package]] +name = "wit-bindgen" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5c3d15a04ce994fad2c5442a754b404ab1fee23c903a04a560f84f94fdf63c0" +dependencies = [ + "bitflags 2.3.3", + "wit-bindgen-rust-macro", +] + +[[package]] name = "wit-bindgen-core" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d422d36cbd78caa0e18c3371628447807c66ee72466b69865ea7e33682598158" +checksum = "c9658ec54d4a3c9e2f079bc65a131093337595b595fbf82f805008469838cdea" dependencies = [ "anyhow", - "wit-component", + "wit-component 0.12.0", "wit-parser", ] [[package]] name = "wit-bindgen-rust" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b76db68264f5d2089dc4652581236d8e75c5b89338de6187716215fd0e68ba3" +checksum = "21ae6a6198ba9765771b977e2af985a0d5ac71b59f999da5c4ee1c7bbd8ca8dc" dependencies = [ "heck", - "wasm-metadata", + "wasm-metadata 0.9.0", "wit-bindgen-core", "wit-bindgen-rust-lib", - "wit-component", + "wit-component 0.12.0", ] [[package]] name = "wit-bindgen-rust-lib" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c50f334bc08b0903a43387f6eea6ef6aa9eb2a085729f1677b29992ecef20ba" +checksum = "5c31de8c6c77cac1fd4927c7584d1314cd5e838cfb40b53333d6dffc7a132dda" dependencies = [ "heck", "wit-bindgen-core", ] [[package]] +name = "wit-bindgen-rust-macro" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a2abe5c7c4c08468d01590aa96c8a684dd94fb9241a248af88eef7edac61e43" +dependencies = [ + "anyhow", + "proc-macro2", + "syn 2.0.27", + "wit-bindgen-core", + "wit-bindgen-rust", + "wit-bindgen-rust-lib", + "wit-component 0.12.0", +] + +[[package]] name = "wit-component" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbd4c7f8f400327c482c88571f373844b7889e61460650d650fc5881bb3575c" +checksum = "253bd426c532f1cae8c633c517c63719920535f3a7fada3589de40c5b734e393" dependencies = [ "anyhow", "bitflags 1.3.2", - "indexmap 1.9.3", + "indexmap 2.0.0", + "log", + "wasm-encoder 0.30.0", + "wasm-metadata 0.9.0", + "wasmparser 0.108.0", + "wit-parser", +] + +[[package]] +name = "wit-component" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d843f4dfead0d465b09e8bfba4d3dcb1a1bcc857f87917d348c7fa401158bc5" +dependencies = [ + "anyhow", + "bitflags 2.3.3", + "indexmap 2.0.0", "log", - "wasm-encoder", - "wasm-metadata", - "wasmparser", + "wasm-encoder 0.31.1", + "wasm-metadata 0.10.1", + "wasmparser 0.110.0", "wit-parser", ] [[package]] name = "wit-parser" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" +checksum = "541efa2046e544de53a9da1e2f6299e63079840360c9e106f1f8275a97771318" dependencies = [ "anyhow", "id-arena", - "indexmap 1.9.3", + "indexmap 2.0.0", "log", "pulldown-cmark", "semver", diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index cfd461d4a56..9269ff431f1 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -1,47 +1,38 @@ { lib , rustPlatform , fetchFromGitHub -, curl , pkg-config -, libgit2 , openssl -, zlib , stdenv , darwin }: rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-07-05"; + version = "unstable-2023-07-28"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "84ad1dc2c383dd3335953f9d1b059aeef9a5833e"; - hash = "sha256-C066dXuGpl9bwKRh5kgN0DOjaEke84cj5ustYrM867I="; + rev = "b58f10c867f666c1c799b766fb8cd1941ede8ed7"; + hash = "sha256-BwrbenOg+Q6BAy/Mn8AHB0VvvIZ0cYvq4r791QEFTdo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "warg-api-0.1.0" = "sha256-ElLwaOv0ifi8og2SJ6XZkjZX83IXoveicAUPBok/MLE="; + "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc="; }; }; nativeBuildInputs = [ - curl pkg-config ]; buildInputs = [ - curl - libgit2 openssl - zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation ]; # requires the wasm32-wasi target diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index ecaed4e280f..0a2301152e4 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.11"; + version = "0.36.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kISukYfjEKwwahMGdkEyRbZESetsx/6aU6U+/bZWnbQ="; + sha256 = "sha256-dsHjSy3LV6L/P5cAKTqOjT4LM33qvjKTIHGcqrBzWqU="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-q2Cyu/+ZVAj6gv9dH0FMuyf7FkhNTfcnxWz/STFb3b8="; + cargoHash = "sha256-w1TmUMEKg1/VP/AQQWdW4olp0gwCm9zmiuPQ9fQh9ak="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index eb2bf54f299..6542dacbe9e 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -3,8 +3,6 @@ , stdenv , fetchFromGitHub , rustPlatform -, pkg-config -, dbus , libiconv , Security }: @@ -22,10 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EGgVPRaofia+AwXSr6X4Aa8jbk5qDkXg1XvMoEp0qMQ="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ dbus ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; # Requires network access, fails in sandbox. doCheck = false; diff --git a/pkgs/development/tools/rust/measureme/Cargo.lock b/pkgs/development/tools/rust/measureme/Cargo.lock new file mode 100644 index 00000000000..a1e663a7d5c --- /dev/null +++ b/pkgs/development/tools/rust/measureme/Cargo.lock @@ -0,0 +1,993 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +dependencies = [ + "const-random", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "analyzeme" +version = "9.2.0" +source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" +dependencies = [ + "byteorder", + "measureme 9.2.0", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "analyzeme" +version = "10.1.1" +dependencies = [ + "analyzeme 9.2.0", + "decodeme", + "flate2", + "measureme 10.1.1", + "memchr", + "rustc-hash", + "serde", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crox" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "rustc-hash", + "serde", + "serde_json", + "structopt", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "csv" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +dependencies = [ + "csv-core", + "itoa 1.0.6", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "decodeme" +version = "10.1.1" +dependencies = [ + "measureme 10.1.1", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "flamegraph" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "inferno", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "inferno" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2a71c56e4c218f2a1d36bc5177cbfdedf89697ac68610ac3c8452cde152231" +dependencies = [ + "ahash", + "itoa 0.4.8", + "lazy_static", + "log", + "num-format", + "quick-xml", + "rgb", + "str_stack", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.146" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "measureme" +version = "9.2.0" +source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" +dependencies = [ + "log", + "memmap2", + "parking_lot", + "perf-event-open-sys 1.0.1", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "measureme" +version = "10.1.1" +dependencies = [ + "log", + "memmap2", + "parking_lot", + "perf-event-open-sys 3.0.0", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +dependencies = [ + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mmedit" +version = "10.1.1" +dependencies = [ + "decodeme", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "mmview" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "num-format" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" +dependencies = [ + "arrayvec", + "itoa 1.0.6", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "perf-event-open-sys" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a" +dependencies = [ + "libc", +] + +[[package]] +name = "perf-event-open-sys" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29be2ba35c12c6939f6bc73187f728bba82c3c062ecdc5fa90ea739282a1f58" +dependencies = [ + "libc", +] + +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "serde_json" +version = "1.0.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +dependencies = [ + "itoa 1.0.6", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "stack_collapse" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "str_stack" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "summarize" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "prettytable-rs", + "rustc-hash", + "serde", + "serde_json", + "structopt", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "version_checker" +version = "10.1.1" +dependencies = [ + "glob", + "regex", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/tools/rust/measureme/default.nix b/pkgs/development/tools/rust/measureme/default.nix new file mode 100644 index 00000000000..79b938b2adc --- /dev/null +++ b/pkgs/development/tools/rust/measureme/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "measureme"; + version = "10.1.1"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "measureme"; + rev = version; + hash = "sha256-RCh6fTa4d+/Fj5ID5Su3pCZj/O+FhITzfKixXu9G550="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "Support crate for rustc's self-profiling feature"; + homepage = "https://github.com/rust-lang/measureme"; + license = licenses.asl20; + maintainers = [ maintainers.t4ccer ]; + }; +} diff --git a/pkgs/development/tools/rust/probe-rs/default.nix b/pkgs/development/tools/rust/probe-rs/default.nix index 91dc69c6dce..ef9588a12ae 100644 --- a/pkgs/development/tools/rust/probe-rs/default.nix +++ b/pkgs/development/tools/rust/probe-rs/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs"; - version = "0.19.0"; + version = "0.20.0"; src = fetchCrate { inherit pname version; - hash = "sha256-SPfCZil56UMr1Gy9pPZyngT0sHMQJrcE4KcjLvTD4js="; + hash = "sha256-IjeQPsHDHmKmS0UeivgmM8dQyhwak1PBIBw31KlVu64="; }; - cargoHash = "sha256-QEOlsKnCMpm4L2Y1Byqntxjgg3zQFYCGkkwFRqmqx0I="; + cargoHash = "sha256-BkYidZzqiI7EIgEuYbeGC7qeVvhC1GARFC4EZpDdBmg="; cargoBuildFlags = [ "--features=cli" ]; diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index 9a4ad9e571f..8fd71919a1a 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = version; - sha256 = "sha256-c55MiXpMnOsMUI5Bg6k8Ta9iT3G+ixzfMbj9T17OKAY="; + sha256 = "sha256-H1F+sz7PLpuBgQCo/InxPStbg/S6JILjr0IZ+GEGaSM="; }; - cargoSha256 = "sha256-yuwerF4gICPSpwopB4iMheXC7SMtX7IgSEgRwJ/gJdg="; + cargoSha256 = "sha256-O8JveH5RzkhUVHqUSzfPOujfH3HcoRMZ455QvMFyJLI="; # tests require network access doCheck = false; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index a81cc6bddd9..5b8c3e94124 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-IgTAUxA1Cfe0LaYKrKtbm1PELGic31XRdGMIoLDG6w0="; + hash = "sha256-dCGUTt5pqT3HmlUNIdrgKFvMVhyosyQFElFHBswTbio="; }; vendorHash = null; diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix index f9f74eec6b5..7daa9401a18 100644 --- a/pkgs/development/tools/twitch-cli/default.nix +++ b/pkgs/development/tools/twitch-cli/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.19"; + version = "1.1.20"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-osR7+oQ0QBIk/OrMb4Txhb31zELi+eoM47GsWgF/PAg="; + hash = "sha256-hIyZwXDI3lJQOK27RaABf7cnj7jOxKdLUdZB5fp+7kY="; }; patches = [ diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 2136876483b..7e6d3b66183 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dMN1OY9r2lK/z692gq3mLhmDm2LaNdoCT2/zxmFS0uA="; + sha256 = "sha256-z03+3x1xGYSa+WVEuHBgUQ9NdqG3rCziNYcwTjWBNV8="; }; - cargoHash = "sha256-y5anlqt7deQDjfrfKpXHKle5g24Cruy7bs68pm0bCD4="; + cargoHash = "sha256-4sgf7WfaX7jnV8YynZNLi/N8MfkuAc4tk/8eiKEyyxI="; meta = with lib; { description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 8925378e627..abf2ff4b432 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.2.2"; + version = "2023.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-XM7OLr5ety95jjlVqNuQp3rD9laoe1uC1HNP66HJe5M="; + sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk="; }; nativeBuildInputs = [ diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index b21cdadac1e..28e2a58b0d0 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -15,11 +15,11 @@ buildPythonApplication { doCheck = false; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome.adwaita-icon-theme gtk3 gobject-introspection + gnome.adwaita-icon-theme gtk3 ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 4b674ac129d..77eab7918b9 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -21,10 +21,9 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 - gobject-introspection ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 diff --git a/pkgs/games/hheretic/default.nix b/pkgs/games/hheretic/default.nix new file mode 100644 index 00000000000..73adca8928c --- /dev/null +++ b/pkgs/games/hheretic/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL +, SDL_mixer +, autoreconfHook +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hheretic"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "sezero"; + repo = "hheretic"; + rev = "hheretic-${finalAttrs.version}"; + hash = "sha256-e9N869W8STZdLUBSscxEnF2Z+SrdVv8ARDL8AMe1SJ8="; + }; + + nativeBuildInputs = [ + autoreconfHook + SDL.dev + ]; + + buildInputs = [ + SDL + SDL_mixer + ]; + + strictDeps = true; + enableParallelBuilding = true; + + configureFlags = [ "--with-audio=sdlmixer" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 hheretic-gl -t $out/bin + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "hheretic-"; + }; + + meta = { + description = "Linux port of Raven Game's Heretic"; + homepage = "https://hhexen.sourceforge.net/hhexen.html"; + license = lib.licenses.gpl2Plus; + mainProgram = "hheretic-gl"; + maintainers = with lib.maintainers; [ moody ]; + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix index 4b978ab5651..075aae69978 100644 --- a/pkgs/games/hhexen/default.nix +++ b/pkgs/games/hhexen/default.nix @@ -1,23 +1,56 @@ -{ lib, fetchurl, SDL, stdenv }: +{ lib +, stdenv +, fetchFromGitHub +, SDL +, SDL_mixer +, autoreconfHook +, gitUpdater +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hhexen"; version = "1.6.3"; - src = fetchurl { - url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz"; - sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b"; + + src = fetchFromGitHub { + owner = "sezero"; + repo = "hhexen"; + rev = "hhexen-${finalAttrs.version}"; + hash = "sha256-y3jKfU4e8R2pJQN/FN7W6KQ7D/P+7pmQkdmZug15ApI="; }; - buildInputs = [ SDL ]; + nativeBuildInputs = [ + autoreconfHook + SDL.dev + ]; + + buildInputs = [ + SDL + SDL_mixer + ]; + + strictDeps = true; + enableParallelBuilding = true; + + configureFlags = [ "--with-audio=sdlmixer" ]; + installPhase = '' + runHook preInstall + install -Dm755 hhexen-gl -t $out/bin + + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "hhexen-"; + }; + + meta = { description = "Linux port of Raven Game's Hexen"; homepage = "https://hhexen.sourceforge.net/hhexen.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ djanatyn ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ moody djanatyn ]; mainProgram = "hhexen-gl"; + inherit (SDL.meta) platforms; }; -} +}) diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/games/jumpnbump/default.nix index b502b4f1396..193d4dc0b58 100644 --- a/pkgs/games/jumpnbump/default.nix +++ b/pkgs/games/jumpnbump/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; - buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 gobject-introspection ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook gobject-introspection ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 ]; postInstall = '' make -C menu PREFIX=$out all install diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index cc49d6338a6..0ca0deb518f 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -1,6 +1,7 @@ { stdenv , boost , cmake +, config , cudaPackages , eigen , fetchFromGitHub @@ -14,7 +15,7 @@ , openssl , writeShellScriptBin , enableAVX2 ? stdenv.hostPlatform.avx2Support -, backend ? "opencl" +, backend ? if config.cudaSupport then "cuda" else "opencl" , enableBigBoards ? false , enableContrib ? false , enableTcmalloc ? true diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index a8e883acae3..3009eb0b9a0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -100,8 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ]; - buildInputs = [ gobject-introspection ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems gobject-introspection ]; sourceRoot = "."; diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 8aa3ecdc589..4d09d7715ac 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.16"; + version = "6.0.19"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-jA4NqLZw+JREj0UlEMjcatb6PeBHpiNKrFenpe3HyBw="; + hash = "sha256-dFY+t6MVRdbp0z5mbnREd/t6v1D+7g/vD+K8mcJvn9E="; }; - cargoHash = "sha256-wvN7aa4LjvYIJZtUedAscD2x8EKpdtzc5b1YI9MTeLY="; + cargoHash = "sha256-mLRD5Z/ZzfT1BFFSyYmJkY98vMY/Elt3Gy0SboCpzec="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 17b6f3813a9..9df1182e1ab 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "prismlauncher-unwrapped"; - version = "7.1"; + version = "7.2"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = version; - sha256 = "sha256-ri4oaeJKmvjJapUASPX10nl4JcLPjA3SgTp2EyaEPWg="; + sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; }; nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - cmakeFlags = lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] + cmakeFlags = [ + # downstream branding + "-DLauncher_BUILD_PLATFORM=nixpkgs" + ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]; postUnpack = '' diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index e3dc9c94522..85ef0766b8e 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "scummvm"; repo = "scummvm"; rev = "v${version}"; - hash = "sha256-kyWgy5Nm8v/zbnhNMUyy/wUIq0I6nQyM9UqympYfwvg="; + hash = "sha256-GVsvLAjb7pECd7uvPT9ubDFMIkiPWdU5owOafxk5iy0="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2487cc0ef7c..bf27895c20f 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -140,6 +140,7 @@ in buildFHSEnv rec { # SteamVR udev + dbus # Other things from runtime glib @@ -199,7 +200,6 @@ in buildFHSEnv rec { # screeps dependencies gtk3 - dbus zlib atk cairo diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 88e2473801a..13d63117b7f 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -41,6 +41,11 @@ in stdenv.mkDerivation { meta = with lib; { description = "A digital distribution platform"; + longDescription = '' + Steam is a video game digital distribution service and storefront from Valve. + + To install on NixOS, please use the option `programs.steam.enable = true`. + ''; homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga jonringer ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 7c85da21f7f..7d5b622eaa8 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline, eigen, celt +, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies , aften, AudioUnit, CoreAudio, libobjc, Accelerate @@ -46,9 +46,8 @@ stdenv.mkDerivation (finalAttrs: { aften AudioUnit CoreAudio Accelerate libobjc ]; - prePatch = '' - substituteInPlace svnversion_regenerate.sh \ - --replace /bin/bash ${bash}/bin/bash + postPatch = '' + patchShebangs --build svnversion_regenerate.sh ''; dontAddWafCrossFlags = true; diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/os-specific/darwin/grandperspective/default.nix index a1156c7cb87..0d57d4f2771 100644 --- a/pkgs/os-specific/darwin/grandperspective/default.nix +++ b/pkgs/os-specific/darwin/grandperspective/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, undmg, ... }: +{ stdenv, lib, fetchurl, undmg }: -stdenv.mkDerivation rec { - version = "3.0.1"; +stdenv.mkDerivation (finalAttrs: { + version = "3.4.1"; pname = "grandperspective"; src = fetchurl { - inherit version; - url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${builtins.replaceStrings [ "." ] [ "_" ] version}.dmg"; - sha256 = "sha256-ZPqrlN9aw5q7656GmmxCnTRBw3lu9n952rIyun8MsiI="; + inherit (finalAttrs) version; + url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}.dmg"; + hash = "sha256-iTtvP6iONcfDWJ3qMh+TUJMN+3spwCQ/5S+A307BJCM="; }; sourceRoot = "GrandPerspective.app"; @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { the file's size. Files in the same folder appear together, but their placement is otherwise arbitrary. ''; homepage = "https://grandperspectiv.sourceforge.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ eliandoran ]; - platforms = [ "x86_64-darwin" ]; + platforms = platforms.darwin; }; -} +}) diff --git a/pkgs/os-specific/linux/dcgm/default.nix b/pkgs/os-specific/linux/dcgm/default.nix new file mode 100644 index 00000000000..36c7e3ca688 --- /dev/null +++ b/pkgs/os-specific/linux/dcgm/default.nix @@ -0,0 +1,147 @@ +{ lib +, callPackage +, gcc11Stdenv +, fetchFromGitHub +, addOpenGLRunpath +, catch2 +, cmake +, cudaPackages_10_2 +, cudaPackages_11_8 +, cudaPackages_12 +, fmt_9 +, git +, jsoncpp +, libevent +, plog +, python3 +, symlinkJoin +, tclap_1_4 +, yaml-cpp +}: +let + # Flags copied from DCGM's libevent build script + libevent-nossl = libevent.override { sslSupport = false; }; + libevent-nossl-static = libevent-nossl.overrideAttrs (super: { + CFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC"; + CXXFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC"; + configureFlags = super.configureFlags ++ [ "--disable-shared" "--with-pic" ]; + }); + + jsoncpp-static = jsoncpp.override { enableStatic = true; }; + + # DCGM depends on 3 different versions of CUDA at the same time. + # The runtime closure, thankfully, is quite small because most things + # are statically linked. + cudaPackageSetByVersion = [ + { + version = "10"; + # Nixpkgs cudaPackages_10 doesn't have redist packages broken out. + pkgSet = [ + cudaPackages_10_2.cudatoolkit + cudaPackages_10_2.cudatoolkit.lib + ]; + } + { + version = "11"; + pkgSet = getCudaPackages cudaPackages_11_8; + } + { + version = "12"; + pkgSet = getCudaPackages cudaPackages_12; + } + ]; + + # Select needed redist packages from cudaPackages + # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/scripts/0080_cuda.sh#L24-L39 + getCudaPackages = p: with p; [ + cuda_cccl + cuda_cudart + cuda_nvcc + cuda_nvml_dev + libcublas + libcufft + libcurand + ]; + + # Builds CMake code to add CUDA paths for include and lib. + mkAppendCudaPaths = { version, pkgSet }: + let + # The DCGM CMake assumes that the folder containing cuda.h contains all headers, so we must + # combine everything together for headers to work. + # It would be more convenient to use symlinkJoin on *just* the include subdirectories + # of each package, but not all of them have an include directory and making that work + # is more effort than it's worth for this temporary, build-time package. + combined = symlinkJoin { + name = "cuda-combined-${version}"; + paths = pkgSet; + }; + # The combined package above breaks the build for some reason so we just configure + # each package's library path. + libs = lib.concatMapStringsSep " " (x: ''"${x}/lib"'') pkgSet; + in '' + list(APPEND Cuda${version}_INCLUDE_PATHS "${combined}/include") + list(APPEND Cuda${version}_LIB_PATHS ${libs}) + ''; + +# gcc11 is required by DCGM's very particular build system +# C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22 +in gcc11Stdenv.mkDerivation rec { + pname = "dcgm"; + version = "3.1.8"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "DCGM"; + rev = "refs/tags/v${version}"; + hash = "sha256-OXqXkP2ZUNPzafGIgJ0MKa39xB84keVFFYl+JsHgnks="; + }; + + # Add our paths to the CUDA paths so FindCuda.cmake can find them. + EXTRA_CUDA_PATHS = lib.concatMapStringsSep "\n" mkAppendCudaPaths cudaPackageSetByVersion; + prePatch = '' + echo "$EXTRA_CUDA_PATHS"$'\n'"$(cat cmake/FindCuda.cmake)" > cmake/FindCuda.cmake + ''; + + hardeningDisable = [ "all" ]; + + nativeBuildInputs = [ + addOpenGLRunpath + cmake + git + python3 + + jsoncpp-static + jsoncpp-static.dev + libevent-nossl-static + libevent-nossl-static.dev + plog.dev # header-only + tclap_1_4 # header-only + ]; + + buildInputs = [ + catch2 + fmt_9 + yaml-cpp + ]; + + # libcuda.so must be found at runtime because it is supplied by the NVIDIA + # driver. autoAddOpenGLRunpathHook breaks on the statically linked exes. + postFixup = '' + find "$out/bin" "$out/lib" -type f -executable -print0 | while IFS= read -r -d "" f; do + if isELF "$f" && [[ $(patchelf --print-needed "$f" || true) == *libcuda.so* ]]; then + addOpenGLRunpath "$f" + fi + done + ''; + + disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion; + + meta = with lib; { + description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs."; + homepage = "https://developer.nvidia.com/dcgm"; + license = licenses.asl20; + maintainers = teams.deshaw.members; + mainProgram = "dcgmi"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index a2229a0a60c..b76a77fb3a6 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { version = source.version; src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${source.revision}.tar.gz"; hash = source.sourceHash; }; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 01ea40a5089..7cd541402bd 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,7 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20230625"; - sourceHash = "sha256-olRaUVnCri/sJU6ob+QgNxEZF8GzVxxEh8zdNJIZlYY="; - outputHash = "sha256-zSlMpAPbW7ewEBzDre47/7NJyy2pC0GSbkyOVVi+4gU="; + version = "unstable-2023-07-24"; + revision = "59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c"; + sourceHash = "sha256-WyO/+fxQljfo6OXLC8/BomGmKtUQaJ1Lt9V5Fdv172g="; + outputHash = "sha256-wHWPSyqxP+MGmerbc2v/hclFFJ7qKCDsupK5GASjp8s="; } diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/pkgs/os-specific/linux/firmware/linux-firmware/update.sh index 1fccc03e86b..4b28d6e1374 100755 --- a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh +++ b/pkgs/os-specific/linux/firmware/linux-firmware/update.sh @@ -5,14 +5,20 @@ cd "$(dirname "$(readlink -f "$0")")" || exit repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" # step 1: figure out the latest version from the tags -if [ -z "$1" ]; then - version="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" +if [ -z "${1:-}" ]; then + revision="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" + version=$revision else - version=$1 + revision=$1 + if [ -z "${2:-}" ]; then + version="unstable-$(date "+%Y-%m-%d")" + else + version=$2 + fi fi # step 2: prefetch the source tarball -snapshotUrl="$repo/snapshot/linux-firmware-$version.tar.gz" +snapshotUrl="$repo/snapshot/linux-firmware-$revision.tar.gz" hash="$(nix-prefetch-url --unpack "$snapshotUrl")" sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")" @@ -20,6 +26,7 @@ sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")" cat > source.nix << EOF { version = "$version"; + revision = "$revision"; sourceHash = "$sriHash"; outputHash = null; } @@ -33,6 +40,7 @@ cat > source.nix << EOF # This file is autogenerated! Run ./update.sh to regenerate. { version = "$version"; + revision = "$revision"; sourceHash = "$sriHash"; outputHash = "$outHash"; } diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 60fa6dea9ec..2f33a139c9d 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz"; - sha256 = "sha256-V39FCHW9gzr5uLcW42jYc6rJE6Nd2ZbHqg9Srd3vku4="; + sha256 = "sha256-kyLCp2NtAoRcOyaYTVirj3jWP/THZtCEwxlqWF4ACQU="; }; dontFixup = true; # binaries must not be stripped or patchelfed diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index fc7da8fe9ba..c19646ac529 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-zN9FI4emOAlz0pJzY+nLuTn6IGiRWm+Tf/nSRSICRoM="; + sha256 = "sha256-LrbGyXK+lYm6tzMnW/AgvrX2RNX5Q5c3kg5wGvbPNIU="; }; # vlock is moved into its own output, since it depends on pam. This diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c1cb0cfe72e..d53a05d9109 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -59,16 +59,6 @@ "sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac", "version": "6.1.39" }, - "6.3": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.3.13-hardened1.patch", - "sha256": "1iy95awbkrdk5529w9s07axb21l2snab4kifbzjghhz9vwzx22rp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.3.13-hardened1/linux-hardened-6.3.13-hardened1.patch" - }, - "sha256": "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa", - "version": "6.3.13" - }, "6.4": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 47c8cc9cbe0..e71cdee98da 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.288"; + version = "4.19.289"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk"; + sha256 = "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f550778eac9..cf739060989 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.186"; + version = "5.10.187"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"; + sha256 = "1fwbz5xg3jxfzji9jlxqwf5rz9acgn4sm2inp3l017iy1chm957n"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 3bf19de2833..8c66af32b44 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.121"; + version = "5.15.122"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "07f3a68r1yb4p19z1azjwp2vhjb3ayh31hz9hfb4a98dn2ywxq07"; + sha256 = "0b9ljdi9vgwzw4wa8gx1ia5fmb1pm8lnslx0q2l2kqhwrl0mhx9q"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 99205ad3396..daa4385b761 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.249"; + version = "5.4.250"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w"; + sha256 = "1ywil04x3mw62n53pkrkxrhkg1xyi3g9ssvg6igbyqk0a9v8hnqg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index c8ecfc95f35..7fade741a74 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.40"; + version = "6.1.41"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1w474pia4pxz4qbfai27ary1y1h2fnn7kvx7yz7wszd0jwhzrsj3"; + sha256 = "1dqbawgcpwxszqqnf7a66db8xlldxnr4f3sqlq42l1gaiskhja1i"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix deleted file mode 100644 index 0f1a8f9866d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, fetchurl, buildLinux, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.3.13"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix index b87269589ae..aaa568ff2b3 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4.5"; + version = "6.4.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1dz9inr1bf7jx5s9n0dfa0srfzrwnz1zmdq42bbxyl9w8q3jqkip"; + sha256 = "192ya79h3lw781ka22ibgbvdcx6maa74nyk0lqjsz2n4xybc9v71"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 38912e0aa21..9306099213a 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78="; + hash = "sha256-y0NIb/KsKpCd8byr/SXI7nwTKXP2/bSSoW8QgeL5xdc="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "-Ddbroot=/etc/iscsi" ]; - passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; }; + passthru.tests = { inherit (nixosTests) iscsi-root; }; meta = with lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index 5ef0b0b0ea7..ce59cea368b 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapGAppsHook + gobject-introspection ] ++ lib.optionals withDoc [ sphinx graphviz @@ -81,7 +82,6 @@ stdenv.mkDerivation rec { pcre zstd glib - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index e208bcba9c7..5680f93e21a 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -15,10 +15,7 @@ callPackage ./generic.nix args { if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.4" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then - linuxKernel.packages.linux_6_3 - else - linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; # this package should point to the latest release. version = "2.1.12"; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index f262f77970b..832eb66c02e 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -11,17 +11,11 @@ let in callPackage ./generic.nix args { # check the release notes for compatible kernels - # NOTE: - # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 - # for future releases, please delete this condition. kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.4" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then - linuxKernel.packages.linux_6_3 - else - linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index ec63e7e3a80..cd1b8c950f5 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-DM/EhbKp2sM5OnvFrb2GcjhgMN+9kuVW33wHVSxcoLo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-t+nFutMp1DwK7S9rQXcGQJjG/8plmlu5rJ1v5t8zJzE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-rzGFcWou9+rDJuxqY6utnT54jAVLG2oj3Og8Fr8pibU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-irL+9P+ZmGsAqbCOEtaC0u+YJykRgjG7dJx1qvP197w="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-JkDQ9kmXuwcFXcfyDYwgI/NHqJYZj/PbhZfqlL0jvnw="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-6XEtCqlYIFh4Aw/Y+PxvLJmk5os5T0JPMnE2yTdT4Tw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-YBE4yL63Ee1UmkE7pIbLKOLLhiY5DpN1t8i/ovQOKXo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-o2EmkJ9jJAhQS25JCN15GBb+gGFOiKS/87PW2ge0YNg="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-Lj4eCcMgpy2AlGHKA/xRxZc2HV3llykWwVeTUlHXvyI="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-YjecZiVwaK3/1In5uKSE5pF21YQJNpxEpPK0abNf3iQ="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-vAP/xc3IYMCtDbog2qB3kK5ftbsrk8meLD0IGx9tNa8="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-Or650AgvB/452wFiBLw1DezLIzYMSg0dQG66HeKypYg="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-XiWExZZbtCdl/1Koi1dTKsiLl5xSwpI8LiGxjX2yT+A="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-i/jKr05o7UeXdEPusTQP0FeQoATl36ydDgtg5w/pMO4="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 5322c342d31..b42d1818cf9 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.32"; + version = "0.107.34"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 20; + schema_version = 24; tests.adguardhome = nixosTests.adguardhome; }; diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 92007bd6ee4..7b34075233d 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -48,10 +48,15 @@ with python.pkgs; buildPythonApplication rec { sourceRoot = "source/backend"; postPatch = '' + # use input files to not depend on outdated peer dependencies + mv requirements/base.{in,txt} + mv requirements/dev.{in,txt} + # remove dependency constraints - sed 's/[~<>=].*//' -i requirements/base.in requirements/base.txt - sed 's/zope-interface/zope.interface/' -i requirements/base.in requirements/base.txt - sed 's/\[standard\]//' -i requirements/base.in requirements/base.txt + sed -i requirements/base.txt \ + -e 's/[~<>=].*//' -i requirements/base.txt \ + -e 's/zope-interface/zope.interface/' \ + -e 's/\[standard\]//' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index ba394429926..492ab613162 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.8"; + version = "3.2.9"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e"; + sha256 = "bc1f9eb8c9f67f52805f3acfa2d0153190245fa145b007fafa9068d2da292506"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d79b8cf5c91..4fda9cc7055 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -451,6 +451,10 @@ in python.pkgs.buildPythonApplication rec { "--deselect tests/test_config.py::test_merge" # AssertionError: assert 2 == 1 "--deselect=tests/helpers/test_translation.py::test_caching" + # AssertionError: assert None == RegistryEntry + "--deselect=tests/helpers/test_entity_registry.py::test_get_or_create_updates_data" + # AssertionError: assert 2 == 1 + "--deselect=tests/helpers/test_entity_values.py::test_override_single_value" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 5b1edb5a2d8..e80185ac5cb 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "2.4.1"; + version = "3.0.0"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - hash = "sha256-h9PFzJc/29WFe4mW+xpJAL1Z2XqBxMEtQeN5DMgOVBA="; + hash = "sha256-nUwPT7374dfE/T6yuCUynObq6LxBHDp90Dj2JGwJ4+M="; }; buildInputs = diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index e1f41f2f6b6..3eecd652ada 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -3,8 +3,8 @@ , withPython3 ? true, python3, ncurses , withPHP81 ? true, php81 , withPHP82 ? false, php82 -, withPerl534 ? false, perl534 -, withPerl536 ? true, perl536 +, withPerl536 ? false, perl536 +, withPerl538 ? true, perl538 , withPerldevel ? false, perldevel , withRuby_3_0 ? false, ruby_3_0 , withRuby_3_1 ? true, ruby_3_1 @@ -46,8 +46,8 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP81 php81-unit ++ optional withPHP82 php82-unit - ++ optional withPerl534 perl534 ++ optional withPerl536 perl536 + ++ optional withPerl538 perl538 ++ optional withPerldevel perldevel ++ optional withRuby_3_0 ruby_3_0 ++ optional withRuby_3_1 ruby_3_1 @@ -70,8 +70,8 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} - ${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} + ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 88dacb73986..10cafd2019c 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -14,9 +14,9 @@ buildGoModule rec { vendorHash = "sha256-5o1i88v+1UGYXP2SzyM6seyidrj1Z3Q64w/gi07xf4w="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ gobject-introspection vips ] + buildInputs = [ vips ] ++ lib.optionals stdenv.isDarwin [ libunwind ]; preBuild = '' diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2d45a39fe8a..1f3a4924758 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.532"; + version = "0.21.547"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-WBfFfE8KKkGViMNlxAv+MDt8HMSNQPpaxdxeIC75O02ldVr8rsMpyAdAVw+gH2KQhyJP3VGnLk++FhUCfFCLiw=="; + hash = "sha512-pjtEGLfrBldukGsrYuUF+pO/qE2+WfDnaLkqKGyPJHSYClDJEoT9hEy2LyV1Vk8VqvLAkMSQmmLIwSxr0FjX8g=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 9a51c5b3346..7b1f3c9c7e4 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-uGzJgy+jfV11bZXvCMZAUdjuZasKCcv5rQBBUEidWQU="; + sha256 = "sha256-+4At5of/jaol4c1eElpw/D9hDnWSkc8x4gCmqqg88as="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/stalwart/Cargo.lock b/pkgs/servers/mail/stalwart/Cargo.lock new file mode 100644 index 00000000000..1140656e59c --- /dev/null +++ b/pkgs/servers/mail/stalwart/Cargo.lock @@ -0,0 +1,5642 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead", + "aes", + "cipher 0.4.4", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-gcm-siv" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" +dependencies = [ + "aead", + "aes", + "cipher 0.4.4", + "ctr", + "polyval", + "subtle", + "zeroize", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "serde", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "argon2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash 0.5.0", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.23", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "async-trait" +version = "0.1.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "attohttpc" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +dependencies = [ + "http", + "log", + "rustls 0.20.8", + "serde", + "serde_json", + "url", + "webpki", + "webpki-roots 0.22.6", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "aws-creds" +version = "0.34.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3776743bb68d4ad02ba30ba8f64373f1be4e082fe47651767171ce75bb2f6cf5" +dependencies = [ + "attohttpc", + "dirs", + "log", + "quick-xml 0.26.0", + "rust-ini", + "serde", + "thiserror", + "time 0.3.23", + "url", +] + +[[package]] +name = "aws-region" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056557a61427d0e5ba29dd931031c8ffed4ee7a550e7cd55692a9d8deb0a9dba" +dependencies = [ + "thiserror", +] + +[[package]] +name = "axum" +version = "0.6.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body 0.4.5", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bb8" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" +dependencies = [ + "async-trait", + "futures-channel", + "futures-util", + "parking_lot", + "tokio", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.64.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", +] + +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease 0.2.12", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.27", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + +[[package]] +name = "bitpacking" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +dependencies = [ + "crunchy", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "blake3" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq 0.3.0", + "digest 0.10.7", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blowfish" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32fa6a061124e37baba002e496d203e23ba3d7b73750be82dbfbc92913048a5b" +dependencies = [ + "byteorder", + "cipher 0.2.5", + "opaque-debug", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cedarwood" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode 0.3.6", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "const-oid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "csv" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "dashmap" +version = "5.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +dependencies = [ + "cfg-if", + "hashbrown 0.14.0", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "der" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "dialoguer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +dependencies = [ + "console", + "shell-words", + "tempfile", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "directory" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "argon2", + "async-trait", + "bb8", + "ldap3", + "lru-cache", + "mail-builder", + "mail-parser", + "mail-send", + "md5", + "parking_lot", + "password-hash 0.5.0", + "pbkdf2 0.12.2", + "pwhash", + "rustls 0.21.5", + "scrypt", + "sha1", + "sha2 0.10.7", + "smtp-proto", + "sqlx", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +dependencies = [ + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ece" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd5463ffecc0677adcd786c4481f73b215714d4757edf2eb37a573c03d00459" +dependencies = [ + "base64 0.13.1", + "byteorder", + "hex", + "hkdf", + "lazy_static", + "once_cell", + "openssl", + "serde", + "sha2 0.10.7", + "thiserror", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "farmhash" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f35ce9c8fb9891c75ceadbc330752951a4e369b50af10775955aeb9af3eee34b" + +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "libz-sys", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form-data" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0322eefcd026820bbb430b427f0e9b22fc3952f163df23b74a3c5639bae32f0f" +dependencies = [ + "bytes", + "http", + "httparse", + "memchr", + "mime", + "serde", + "thiserror", + "tracing", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "foundationdb" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8696fd1be198f101eb58aeecf0f504fc02b28c7afcc008b4e4a998a91b305108" +dependencies = [ + "async-recursion", + "async-trait", + "foundationdb-gen", + "foundationdb-macros", + "foundationdb-sys", + "futures", + "memchr", + "rand", + "serde", + "serde_bytes", + "serde_json", + "static_assertions", + "uuid", +] + +[[package]] +name = "foundationdb-gen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62239700f01b041b6372aaeb847c52f960e1a69fd2b1025dc995ea3dd90e3308" +dependencies = [ + "xml-rs", +] + +[[package]] +name = "foundationdb-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "try_map", +] + +[[package]] +name = "foundationdb-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98e49545f5393d276b7b888c77e3f9519fd33727435f8244344be72c3284256f" +dependencies = [ + "bindgen 0.65.1", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.1", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ef12f041acdd397010e5fb6433270c147d3b8b2d0a840cd7fff8e531dca5c8" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body 1.0.0-rc.2", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "human-size" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9994b79e8c1a39b3166c63ae7823bb2b00831e2a96a31399c50fe69df408eaeb" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body 0.4.5", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.0.0-rc.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body 1.0.0-rc.2", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper 0.14.27", + "rustls 0.21.5", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper 0.14.27", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-util" +version = "0.0.0" +source = "git+https://github.com/hyperium/hyper-util#f898015fc9eca9f459ddac521db278d904099e89" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "hyper 1.0.0-rc.4", + "once_cell", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "imap" +version = "0.3.1" +dependencies = [ + "ahash 0.8.3", + "dashmap", + "directory", + "imap_proto", + "jmap", + "jmap_proto", + "mail-parser", + "mail-send", + "md5", + "parking_lot", + "rustls 0.21.5", + "rustls-pemfile", + "store", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", +] + +[[package]] +name = "imap_proto" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "chrono", + "jmap_proto", + "mail-parser", + "tokio", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "indicatif" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.3", + "widestring", + "windows-sys 0.48.0", + "winreg 0.50.0", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jemalloc-sys" +version = "0.5.3+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6" +dependencies = [ + "jemalloc-sys", + "libc", +] + +[[package]] +name = "jieba-rs" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" +dependencies = [ + "cedarwood", + "fxhash", + "hashbrown 0.14.0", + "lazy_static", + "phf", + "phf_codegen", + "regex", +] + +[[package]] +name = "jmap" +version = "0.3.1" +dependencies = [ + "aes-gcm", + "aes-gcm-siv", + "async-stream", + "base64 0.21.2", + "bincode", + "chrono", + "dashmap", + "directory", + "ece", + "form-data", + "form_urlencoded", + "futures-util", + "hkdf", + "http-body-util", + "hyper 1.0.0-rc.4", + "hyper-util", + "jmap_proto", + "mail-builder", + "mail-parser", + "mail-send", + "mime", + "p256", + "reqwest", + "serde", + "serde_json", + "sha2 0.10.7", + "sieve-rs", + "smtp", + "smtp-proto", + "sqlx", + "store", + "tokio", + "tokio-tungstenite", + "tracing", + "tungstenite", + "utils", +] + +[[package]] +name = "jmap-client" +version = "0.3.0" +source = "git+https://github.com/stalwartlabs/jmap-client#a55af189d41a21cf5a51c1c69852cf6143cc8102" +dependencies = [ + "ahash 0.8.3", + "async-stream", + "base64 0.13.1", + "chrono", + "futures-util", + "maybe-async 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot", + "reqwest", + "rustls 0.21.5", + "serde", + "serde_json", + "tokio", + "tokio-tungstenite", +] + +[[package]] +name = "jmap_proto" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "fast-float", + "mail-parser", + "serde", + "serde_json", + "store", + "tokio", + "tracing", + "utils", +] + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lber" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2df7f9fd9f64cf8f59e1a4a0753fe7d575a5b38d3d7ac5758dcee9357d83ef0a" +dependencies = [ + "bytes", + "nom", +] + +[[package]] +name = "ldap3" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dceb52eac140c8679326f619b963577ccf5a4ab025fe5e6db424d2fd3e4f400" +dependencies = [ + "async-trait", + "bytes", + "futures", + "futures-util", + "lazy_static", + "lber", + "log", + "nom", + "percent-encoding", + "ring", + "rustls 0.21.5", + "rustls-native-certs", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", + "tokio-util", + "url", + "x509-parser", +] + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "librocksdb-sys" +version = "0.10.0+7.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" +dependencies = [ + "bindgen 0.64.0", + "bzip2-sys", + "cc", + "glob", + "libc", + "libz-sys", + "lz4-sys", + "zstd-sys", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "mail-auth" +version = "0.3.2" +source = "git+https://github.com/stalwartlabs/mail-auth#a6cd1d6cc0a79943903e8154eecc29f2de003e2a" +dependencies = [ + "ahash 0.8.3", + "flate2", + "lru-cache", + "mail-builder", + "mail-parser", + "parking_lot", + "quick-xml 0.28.2", + "ring", + "rustls-pemfile", + "serde", + "serde_json", + "trust-dns-resolver", + "zip", +] + +[[package]] +name = "mail-builder" +version = "0.3.0" +source = "git+https://github.com/stalwartlabs/mail-builder#e771643f2f4ff8ea86f91f7985b1efa6ffa8aa85" +dependencies = [ + "gethostname", +] + +[[package]] +name = "mail-parser" +version = "0.8.2" +source = "git+https://github.com/stalwartlabs/mail-parser#da62659eb609a8222edf7d1f57b28550a853921e" +dependencies = [ + "encoding_rs", + "serde", +] + +[[package]] +name = "mail-send" +version = "0.4.0" +source = "git+https://github.com/stalwartlabs/mail-send#d5ac9b328308fd95709cb8ee1c3ce37716e210ef" +dependencies = [ + "base64 0.20.0", + "gethostname", + "md5", + "rustls 0.21.5", + "smtp-proto", + "tokio", + "tokio-rustls 0.24.1", + "webpki-roots 0.23.1", +] + +[[package]] +name = "mail-server" +version = "0.3.1" +dependencies = [ + "directory", + "imap", + "jemallocator", + "jmap", + "jmap_proto", + "managesieve", + "smtp", + "store", + "tokio", + "tracing", + "utils", +] + +[[package]] +name = "managesieve" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "bincode", + "directory", + "imap", + "imap_proto", + "jmap", + "jmap_proto", + "mail-parser", + "mail-send", + "md5", + "parking_lot", + "rustls 0.21.5", + "rustls-pemfile", + "sieve-rs", + "store", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "maybe-async" +version = "0.2.7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "maybe-async" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "md-5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "111.26.0+1.1.1u" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-http" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api", + "reqwest", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +dependencies = [ + "async-trait", + "futures", + "futures-util", + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "prost", + "reqwest", + "thiserror", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +dependencies = [ + "futures", + "futures-util", + "opentelemetry", + "prost", + "tonic", + "tonic-build", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2 0.10.7", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.1", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.7", + "hmac 0.12.1", + "password-hash 0.4.2", + "sha2 0.10.7", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", + "hmac 0.12.1", + "password-hash 0.5.0", + "sha2 0.10.7", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "prettyplease" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +dependencies = [ + "proc-macro2", + "syn 2.0.27", +] + +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode 1.0.0", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "privdrop" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bc12de3935536ed9b69488faea4450a298dac44179b54f71806e63f55034bf9" +dependencies = [ + "libc", + "nix", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease 0.1.25", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "pwhash" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419a3ad8fa9f9d445e69d9b185a24878ae6e6f55c96e4512f4a0e28cd3bc5c56" +dependencies = [ + "blowfish", + "byteorder", + "hmac 0.10.1", + "md-5 0.9.1", + "rand", + "sha-1", + "sha2 0.9.9", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot", + "scheduled-thread-pool", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 0.22.6", + "winreg 0.10.1", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "retain_mut" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "roaring" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71" +dependencies = [ + "bytemuck", + "byteorder", + "retain_mut", +] + +[[package]] +name = "rocksdb" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "rpassword" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +dependencies = [ + "bitflags 2.3.3", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rust-s3" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2ac5ff6acfbe74226fa701b5ef793aaa054055c13ebb7060ad36942956e027" +dependencies = [ + "async-trait", + "aws-creds", + "aws-region", + "base64 0.13.1", + "bytes", + "cfg-if", + "futures", + "hex", + "hmac 0.12.1", + "http", + "log", + "maybe-async 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "md5", + "percent-encoding", + "quick-xml 0.26.0", + "reqwest", + "serde", + "serde_derive", + "sha2 0.10.7", + "thiserror", + "time 0.3.23", + "tokio", + "tokio-stream", + "url", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.1", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "password-hash 0.5.0", + "pbkdf2 0.12.2", + "salsa20", + "sha2 0.10.7", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.174" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.174" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serial_test" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "sha-1" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "sieve-rs" +version = "0.3.1" +source = "git+https://github.com/stalwartlabs/sieve#0ab2dc8cd41ee5dadcc3ab5e932b9b92abc5e067" +dependencies = [ + "ahash 0.8.3", + "bincode", + "mail-builder", + "mail-parser", + "phf", + "regex", + "serde", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.7", + "rand_core", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smtp" +version = "0.3.1" +dependencies = [ + "ahash 0.8.3", + "blake3", + "dashmap", + "directory", + "form_urlencoded", + "http-body-util", + "hyper 1.0.0-rc.4", + "hyper-util", + "lazy_static", + "lru-cache", + "mail-auth", + "mail-builder", + "mail-parser", + "mail-send", + "num_cpus", + "parking_lot", + "rand", + "rayon", + "regex", + "reqwest", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "serde_json", + "sha1", + "sha2 0.10.7", + "sieve-rs", + "smtp-proto", + "sqlx", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", + "webpki-roots 0.23.1", + "x509-parser", +] + +[[package]] +name = "smtp-proto" +version = "0.1.1" +source = "git+https://github.com/stalwartlabs/smtp-proto#434ede72159b5f9ea588b9ee8c361a3247aa2f35" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlformat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +dependencies = [ + "ahash 0.8.3", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "serde_json", + "sha2 0.10.7", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.24.0", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.7", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "bytes", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac 0.12.1", + "itoa", + "log", + "md-5 0.10.5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5 0.10.5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", +] + +[[package]] +name = "stalwart-cli" +version = "0.3.1" +dependencies = [ + "clap", + "console", + "csv", + "form_urlencoded", + "futures", + "human-size", + "indicatif", + "jmap-client", + "mail-parser", + "num_cpus", + "prettytable-rs", + "reqwest", + "rpassword", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "stalwart-install" +version = "0.3.1" +dependencies = [ + "base64 0.21.2", + "clap", + "dialoguer", + "flate2", + "indicatif", + "libc", + "openssl", + "pwhash", + "rand", + "reqwest", + "rpassword", + "rusqlite", + "tar", + "zip-extract", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "store" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "bitpacking", + "blake3", + "farmhash", + "foundationdb", + "futures", + "jieba-rs", + "lazy_static", + "lru-cache", + "maybe-async 0.2.7", + "num_cpus", + "parking_lot", + "r2d2", + "rand", + "rayon", + "roaring", + "rocksdb", + "rusqlite", + "rust-s3", + "rust-stemmers", + "serde", + "siphasher", + "tinysegmenter", + "tokio", + "tracing", + "utils", + "whatlang", + "xxhash-rust", +] + +[[package]] +name = "stringprep" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "tar" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "tests" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "async-trait", + "base64 0.21.2", + "bytes", + "chrono", + "csv", + "dashmap", + "directory", + "ece", + "flate2", + "futures", + "http-body-util", + "hyper 1.0.0-rc.4", + "hyper-util", + "imap", + "imap_proto", + "jemallocator", + "jmap", + "jmap-client", + "jmap_proto", + "mail-auth", + "mail-parser", + "mail-send", + "managesieve", + "num_cpus", + "rayon", + "reqwest", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "serde_json", + "serial_test", + "sieve-rs", + "smtp", + "smtp-proto", + "sqlx", + "store", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "tracing-subscriber", + "utils", +] + +[[package]] +name = "thiserror" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinysegmenter" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1755695d17d470baf2d937a59ab4e86de3034b056fc8700e21411b0efca36497" +dependencies = [ + "lazy_static", + "maplit", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.8", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.5", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.5", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite", + "webpki-roots 0.23.1", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.13.1", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +dependencies = [ + "prettyplease 0.1.25", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +dependencies = [ + "crossbeam-channel", + "time 0.3.23", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "ring", + "rustls 0.20.8", + "rustls-pemfile", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tokio-rustls 0.23.4", + "tracing", + "url", + "webpki", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "rustls 0.20.8", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls 0.23.4", + "tracing", + "trust-dns-proto", + "webpki-roots 0.22.6", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "try_map" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580" + +[[package]] +name = "tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls 0.21.5", + "sha1", + "thiserror", + "url", + "utf-8", + "webpki", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "utils" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "dashmap", + "mail-auth", + "mail-send", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry-semantic-conventions", + "privdrop", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "smtp-proto", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-subscriber", +] + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.27", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.1", +] + +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki 0.101.1", +] + +[[package]] +name = "whatlang" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" +dependencies = [ + "hashbrown 0.12.3", + "once_cell", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x509-parser" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab0c2f54ae1d92f4fcb99c0b7ccf0b1e3451cbd395e5f115ccbdbcb18d4f634" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time 0.3.23", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xml-rs" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" + +[[package]] +name = "xxhash-rust" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq 0.1.5", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac 0.12.1", + "pbkdf2 0.11.0", + "sha1", + "time 0.3.23", + "zstd", +] + +[[package]] +name = "zip-extract" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb654964c003959ed64cbd0d7b329bcdcbd9690facd50c8617748d3622543972" +dependencies = [ + "log", + "thiserror", + "zip", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", +] diff --git a/pkgs/servers/mail/stalwart/default.nix b/pkgs/servers/mail/stalwart/default.nix new file mode 100644 index 00000000000..7cff28f413d --- /dev/null +++ b/pkgs/servers/mail/stalwart/default.nix @@ -0,0 +1,74 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, bzip2 +, openssl +, sqlite +, zstd +, stdenv +, darwin +}: + +let + version = "0.3.1"; +in +rustPlatform.buildRustPackage { + pname = "stalwart-mail"; + inherit version; + + src = fetchFromGitHub { + owner = "stalwartlabs"; + repo = "mail-server"; + rev = "v${version}"; + hash = "sha256-RLLKZ1nUYv8fCEd6SSIpy7o88Ee5vs5EaPcfulCXiIU="; + fetchSubmodules = true; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hyper-util-0.0.0" = "sha256-wGtB6hUjIOKR7UZJrX9ve4x4/7TDQuSPG0Sq9VyW7iI="; + "jmap-client-0.3.0" = "sha256-GNqSPygiVq5Z9y8Kfhzacq3lTIEg2o4UxzOMDbBO7xY="; + "mail-auth-0.3.2" = "sha256-CTafQCXPo91ZUlfS9JUqU+RfUf4+6EbdG97+nIqQtNw="; + "mail-builder-0.3.0" = "sha256-0o/fV7ZKiRKeitBBt8yOM/2nXIEgOGSMEMaBj+3i7Kw="; + "mail-parser-0.8.2" = "sha256-XvKEgzQ+HDoLI16CmqE/RRgApg0q9Au9sqOOEpZz6W0="; + "mail-send-0.4.0" = "sha256-bMPI871hBj/RvrW4kESGS9XzfnkSo8r2/9uUwgE12EU="; + "sieve-rs-0.3.1" = "sha256-0LE98L7JEc6FObygIsln4Enw2kx8FnLotJ/fXGpc4E8="; + "smtp-proto-0.1.1" = "sha256-HhKZQHQv3tMEfRZgCoAtyxVzwHbcB4FSjKlMoU1PkHg="; + }; + }; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + buildInputs = [ + bzip2 + openssl + sqlite + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + # Tests require reading to /etc/resolv.conf + doCheck = false; + + meta = with lib; { + description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)"; + homepage = "https://github.com/stalwartlabs/mail-server"; + changelog = "https://github.com/stalwartlabs/mail-server/blob/${version}/CHANGELOG"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 82e75f02217..3859c2df596 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.35.0"; + version = "0.35.2"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-mSU4in+9itJuCdyF10K11f7nhbxztliJq8pX3K0bL2Y="; + hash = "sha256-jotJe7DIPYNekAxiMdghdykEXVD7Pk/MPWSH2XjhkL8="; }; vendorHash = "sha256-MqUkGKOzx8Qo9xbD9GdUryVwKjpVUOXFo2x0/2uz8Uk="; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 76d66cd7635..f1381f954c2 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.7"; + version = "2.14.0"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-YLNzXdR54DA9araC7pxZmopAZB90j9sx4gb3hOVsu0I="; + sha256 = "sha256-MrNfkbbmID27Ht2sDSklrPvRvCmewOuOOBIFnHJz1zE="; }; patches = [ diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix new file mode 100644 index 00000000000..173a978cf2e --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, cudaPackages +, dcgm +, linuxPackages +}: +buildGoModule rec { + pname = "dcgm-exporter"; + version = "3.1.8-3.1.5"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-Jzv3cU3gmGIXV+DV3wV/1zSWwz18s3Jax6JC7WZW7Z4="; + }; + + # Upgrade to go 1.17 during the vendoring FOD build because it fails otherwise. + overrideModAttrs = _: { + preBuild = '' + substituteInPlace go.mod --replace 'go 1.16' 'go 1.17' + go mod tidy + ''; + postInstall = '' + cp go.mod "$out/go.mod" + ''; + }; + + CGO_LDFLAGS = "-ldcgm"; + + buildInputs = [ + dcgm + ]; + + # gonvml and go-dcgm do not work with ELF BIND_NOW hardening because not all + # symbols are available on startup. + hardeningDisable = [ "bindnow" ]; + + # Copy the modified go.mod we got from the vendoring process. + preBuild = '' + cp vendor/go.mod go.mod + ''; + + vendorHash = "sha256-KMCV79kUY1sNYysH0MmB7pVU98r7v+DpLIoYHxyyG4U="; + + nativeBuildInputs = [ + cudaPackages.autoAddOpenGLRunpathHook + ]; + + # Tests try to interact with running DCGM service. + doCheck = false; + + postFixup = '' + patchelf --add-needed libnvidia-ml.so "$out/bin/dcgm-exporter" + ''; + + meta = with lib; { + description = "NVIDIA GPU metrics exporter for Prometheus leveraging DCGM"; + homepage = "https://github.com/NVIDIA/dcgm-exporter"; + license = licenses.asl20; + maintainers = teams.deshaw.members; + mainProgram = "dcgm-exporter"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index f241f48ac52..152332538ff 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -17,9 +17,14 @@ let # Mosquitto needs external poll enabled in libwebsockets. - libwebsockets' = libwebsockets.override { + libwebsockets' = (libwebsockets.override { withExternalPoll = true; - }; + }).overrideAttrs (old: { + # Avoid bug in firefox preventing websockets being created over http/2 connections + # https://github.com/eclipse/mosquitto/issues/1211#issuecomment-958137569 + cmakeFlags = old.cmakeFlags ++ [ "-DLWS_WITH_HTTP2=OFF" ]; + }); + in stdenv.mkDerivation rec { pname = "mosquitto"; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 87b03a9c5a3..e203bc209b8 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.2"; + version = "5.4"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-xUZ8HZb+QEw1t72dyE8rfp666w6rh8yMGYL4H2vJIwE="; + sha256 = "sha256-zKIFjplZtxOEPIH9PUw1gGPS4VSdgv2Zj1oOp3If9W0="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 9b5e144819a..f85e29af194 100644 --- a/pkgs/servers/plex/raw.nix +++ b/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.32.5.7328-2632c9d3a"; + version = "1.32.5.7349-8f4248874"; 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 = "sha256-Xyk73UW3LQqLpvtwvzpixKlrCJyOcDuq9oQkOd/jsLc="; + sha256 = "18j98za5498v02asyyz2sakbl4inyxd6jsa4bjz8zm2jb1knk236"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-p2BynQfAW9FDrdy+KxcnJADwwli7jm2FXGzKjTQPfOE="; + sha256 = "0gm9i752fbplw1l0xlrhzpif5fjiwx471hv55bwbs3ywz3hp0jnb"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 5c2ccd491fc..6ca9bb06409 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-faCA+ATgeEVUg/3KdKcLVypU0wB7YHymXAsTT9Yqgbc="; - aarch64-linux = "sha256-m7Pe2wwwSyannSTROZ70uDczWjOlGeHRjewZgGE76mA="; - x86_64-darwin = "sha256-CoMeJPqS/9AMyjUvxA6lA989Xzebf3pE+Q27ebOwi6c="; - x86_64-linux = "sha256-WPsp0b7YfBKtIR6Y/V4mppctY+wh/gTJ0Vp1KRlZ2+A="; + aarch64-darwin = "sha256-3dKTYw37kmIq9DG4S5qOtjK1QzZeSSCWKeXsfrXctFs="; + aarch64-linux = "sha256-SWt1XTWlWcxF3pcSkiyIXBKllwmVkJvoxB3NrIAj9KQ="; + x86_64-darwin = "sha256-YC6cH5KHzNVdWaNp4vGoGBM8UzVaiE9WfWj5vL/NZ2w="; + x86_64-linux = "sha256-lSar09oOHr2M3pAbF9JlQhYqyd2GoNmVAGmSjm0ZpOg="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.6.3.3608"; + version = "1.7.4.3769"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index 44566e928f8..2bb4f03eb33 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -1,44 +1,49 @@ -# To update package version: -# 1. Change version string in node-package.json and this file -# 2. Run `./generate.sh` to rebuild node dependencies with node2nix -# 3. Build this package `nix-build -A psitransfer` -# 4. Profit - -{ stdenv -, pkgs -, lib -, nodejs_18 -, fetchzip +{ lib +, buildNpmPackage +, fetchFromGitHub }: let - nodejs = nodejs_18; + pname = "psitransfer"; + version = "2.1.2"; + src = fetchFromGitHub { + owner = "psi-4ward"; + repo = "psitransfer"; + rev = "v${version}"; + hash = "sha256-dBAieXIwCEstR9m+6+2/OLPKo2qHynZ1t372Il0mkXk="; + }; + app = buildNpmPackage { + pname = "${pname}-app"; + inherit version src; + + npmDepsHash = "sha256-iCd+I/aTMwQqAMRHan3T191XNz4S3Cy6CDxSLIYY7IA="; + + postPatch = '' + # https://github.com/psi-4ward/psitransfer/pull/284 + touch public/app/.npmignore + cd app + ''; - nodePackages = import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; + installPhase = '' + cp -r ../public/app $out + ''; }; +in buildNpmPackage { + inherit pname version src; + + npmDepsHash = "sha256-H22T5IU8bjbsWhwhchDqppvYfcatbXSWqp6gdoek1Z8="; + + postPatch = '' + rm -r public/app + cp -r ${app} public/app + ''; + + dontBuild = true; - psitransfer = lib.head (lib.attrValues nodePackages); - - combined = psitransfer.override rec { - # version is not defined in source package.json - # version must also be maintained in node-packages.json for node2nix - version = "2.1.2"; - - # override node2nix package src to pull pre-built release of same version - src = fetchzip { - url = "https://github.com/psi-4ward/psitransfer/releases/download/v${version}/psitransfer-v${version}.tar.gz"; - sha256 = "mfldWTVmfcIRa+1g8YDnQqem5YmrFRfCxJoitWcXvns="; - stripRoot = false; - }; - - meta = with lib; { - homepage = "https://github.com/psi-4ward/psitransfer"; - description = "Simple open source self-hosted file sharing solution"; - license = licenses.bsd2; - maintainers = with maintainers; [ hyshka ]; - }; + meta = { + homepage = "https://github.com/psi-4ward/psitransfer"; + description = "Simple open source self-hosted file sharing solution"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ hyshka ]; }; -in - combined +} diff --git a/pkgs/servers/psitransfer/generate.sh b/pkgs/servers/psitransfer/generate.sh deleted file mode 100755 index 79e7ff3a00a..00000000000 --- a/pkgs/servers/psitransfer/generate.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix -set -euo pipefail - -node2nix \ - --nodejs-18 \ - --input node-packages.json \ - --output node-packages.nix \ - --composition node-composition.nix \ - --node-env ../../development/node-packages/node-env.nix \ - ; diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix deleted file mode 100644 index 7b360d03dcf..00000000000 --- a/pkgs/servers/psitransfer/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}: - -let - nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/servers/psitransfer/node-packages.json b/pkgs/servers/psitransfer/node-packages.json deleted file mode 100644 index 4fd418dc70c..00000000000 --- a/pkgs/servers/psitransfer/node-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.1.2" } -] diff --git a/pkgs/servers/psitransfer/node-packages.nix b/pkgs/servers/psitransfer/node-packages.nix deleted file mode 100644 index 183911690ac..00000000000 --- a/pkgs/servers/psitransfer/node-packages.nix +++ /dev/null @@ -1,1781 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@babel/helper-string-parser-7.21.5" = { - name = "_at_babel_slash_helper-string-parser"; - packageName = "@babel/helper-string-parser"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz"; - sha512 = "5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="; - }; - }; - "@babel/helper-validator-identifier-7.19.1" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - }; - "@babel/parser-7.21.8" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz"; - sha512 = "6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="; - }; - }; - "@babel/types-7.21.5" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz"; - sha512 = "m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "acorn-7.4.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; - }; - }; - "archiver-5.3.1" = { - name = "archiver"; - packageName = "archiver"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz"; - sha512 = "8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w=="; - }; - }; - "archiver-utils-2.1.0" = { - name = "archiver-utils"; - packageName = "archiver-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz"; - sha512 = "bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; - }; - }; - "assert-never-1.2.1" = { - name = "assert-never"; - packageName = "assert-never"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz"; - sha512 = "TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="; - }; - }; - "async-3.2.4" = { - name = "async"; - packageName = "async"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - }; - "axios-0.27.2" = { - name = "axios"; - packageName = "axios"; - version = "0.27.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; - }; - }; - "babel-walk-3.0.0-canary-5" = { - name = "babel-walk"; - packageName = "babel-walk"; - version = "3.0.0-canary-5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz"; - sha512 = "GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "basic-auth-2.0.1" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; - sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; - }; - }; - "bl-4.1.0" = { - name = "bl"; - packageName = "bl"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - }; - "body-parser-1.20.1" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "brace-expansion-2.0.1" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "buffer-crc32-0.2.13" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "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=="; - }; - }; - "character-parser-2.2.0" = { - name = "character-parser"; - packageName = "character-parser"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; - sha512 = "+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw=="; - }; - }; - "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 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; - "common-streams-1.4.0" = { - name = "common-streams"; - packageName = "common-streams"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/common-streams/-/common-streams-1.4.0.tgz"; - sha512 = "uQQKfpsGEzk3fZnDWqsUR9Ejo8tP1U3mzbg5+xDzLZb3pFtX58PJidCzpY4Kt5Lvp87e2Bu1UVUGxe3ciYnnyQ=="; - }; - }; - "compress-commons-4.1.1" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz"; - sha512 = "QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "constantinople-4.0.1" = { - name = "constantinople"; - packageName = "constantinople"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz"; - sha512 = "vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.5" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; - sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; - }; - }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "cors-2.8.5" = { - name = "cors"; - packageName = "cors"; - version = "2.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; - sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; - }; - }; - "crc-32-1.2.2" = { - name = "crc-32"; - packageName = "crc-32"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz"; - sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; - }; - }; - "crc32-stream-4.0.2" = { - name = "crc32-stream"; - packageName = "crc32-stream"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz"; - sha512 = "DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w=="; - }; - }; - "crypto-js-4.1.1" = { - name = "crypto-js"; - packageName = "crypto-js"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; - sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "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"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - }; - "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.2.0" = { - name = "destroy"; - packageName = "destroy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; - }; - }; - "doctypes-1.1.0" = { - name = "doctypes"; - packageName = "doctypes"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; - sha512 = "LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ=="; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "express-4.18.2" = { - name = "express"; - packageName = "express"; - version = "4.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; - }; - }; - "finalhandler-1.2.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "form-data-4.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "fs-constants-1.0.0" = { - name = "fs-constants"; - packageName = "fs-constants"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; - sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; - }; - }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha512 = "9ztMtDZtSKC78V8mev+k31qaTabbmuH5jatdvPBMikrFHvw5BqlYnQIn/WGK3WHeRooSTkRvLa2IPlaHjPq5Sg=="; - }; - }; - "fs-promise-2.0.3" = { - name = "fs-promise"; - packageName = "fs-promise"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-promise/-/fs-promise-2.0.3.tgz"; - sha512 = "oDrTLBQAcRd+p/tSRWvqitKegLPsvqr7aehs5N9ILWFM9az5y5Uh71jKdZ/DTMC4Kel7+GNCQyFCx/IftRv8yg=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "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=="; - }; - }; - "get-intrinsic-1.2.0" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "graceful-fs-4.2.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; - sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; - }; - }; - "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-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "http-errors-2.0.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - }; - "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.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "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 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ipaddr.js-1.9.1" = { - 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 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "is-core-module-2.12.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"; - sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ=="; - }; - }; - "is-expression-4.0.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz"; - sha512 = "zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A=="; - }; - }; - "is-promise-2.2.2" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; - sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "js-stringify-1.0.2" = { - name = "js-stringify"; - packageName = "js-stringify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; - sha512 = "rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g=="; - }; - }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha512 = "PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw=="; - }; - }; - "jstransformer-1.0.0" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; - sha512 = "C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A=="; - }; - }; - "lazystream-1.0.1" = { - name = "lazystream"; - packageName = "lazystream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"; - sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw=="; - }; - }; - "lodash.defaults-4.2.0" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; - }; - }; - "lodash.difference-4.5.0" = { - name = "lodash.difference"; - packageName = "lodash.difference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"; - sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="; - }; - }; - "lodash.flatten-4.4.0" = { - name = "lodash.flatten"; - packageName = "lodash.flatten"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; - }; - }; - "lodash.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "meterstream-1.0.1" = { - name = "meterstream"; - packageName = "meterstream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meterstream/-/meterstream-1.0.1.tgz"; - sha512 = "gUTuzs+Cv9JQfZimqsfnzEzQSbGkoQQYNxANJIErF0t9oSpKRvAZmDK2jkx7jyPdezg0AN6QUcG8XuYM6joBsA=="; - }; - }; - "method-override-3.0.0" = { - name = "method-override"; - packageName = "method-override"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-3.0.0.tgz"; - sha512 = "IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimatch-5.1.6" = { - name = "minimatch"; - packageName = "minimatch"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - }; - "morgan-1.10.0" = { - name = "morgan"; - packageName = "morgan"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; - sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - 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=="; - }; - }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "normalize-path-3.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "object-inspect-1.12.3" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; - }; - }; - "on-finished-2.4.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "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 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "pug-3.0.2" = { - name = "pug"; - packageName = "pug"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz"; - sha512 = "bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw=="; - }; - }; - "pug-attrs-3.0.0" = { - name = "pug-attrs"; - packageName = "pug-attrs"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz"; - sha512 = "azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA=="; - }; - }; - "pug-code-gen-3.0.2" = { - name = "pug-code-gen"; - packageName = "pug-code-gen"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz"; - sha512 = "nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg=="; - }; - }; - "pug-error-2.0.0" = { - name = "pug-error"; - packageName = "pug-error"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz"; - sha512 = "sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ=="; - }; - }; - "pug-filters-4.0.0" = { - name = "pug-filters"; - packageName = "pug-filters"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz"; - sha512 = "yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A=="; - }; - }; - "pug-lexer-5.0.1" = { - name = "pug-lexer"; - packageName = "pug-lexer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz"; - sha512 = "0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w=="; - }; - }; - "pug-linker-4.0.0" = { - name = "pug-linker"; - packageName = "pug-linker"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz"; - sha512 = "gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw=="; - }; - }; - "pug-load-3.0.0" = { - name = "pug-load"; - packageName = "pug-load"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz"; - sha512 = "OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ=="; - }; - }; - "pug-parser-6.0.0" = { - name = "pug-parser"; - packageName = "pug-parser"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz"; - sha512 = "ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw=="; - }; - }; - "pug-runtime-3.0.1" = { - name = "pug-runtime"; - packageName = "pug-runtime"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz"; - sha512 = "L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg=="; - }; - }; - "pug-strip-comments-2.0.0" = { - name = "pug-strip-comments"; - packageName = "pug-strip-comments"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz"; - sha512 = "zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ=="; - }; - }; - "pug-walk-2.0.0" = { - name = "pug-walk"; - packageName = "pug-walk"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz"; - sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; - }; - }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; - "readable-stream-2.3.8" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; - sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; - }; - }; - "readable-stream-3.6.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; - sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; - }; - }; - "readdir-glob-1.1.3" = { - name = "readdir-glob"; - packageName = "readdir-glob"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz"; - sha512 = "v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA=="; - }; - }; - "resolve-1.22.3" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; - sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - 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"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "send-0.18.0" = { - name = "send"; - packageName = "send"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; - }; - }; - "serve-static-1.15.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "statuses-2.0.1" = { - name = "statuses"; - packageName = "statuses"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "supports-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "tar-stream-2.2.0" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; - sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; - }; - }; - "thenify-3.3.1" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; - }; - }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - }; - "to-object-reducer-1.0.1" = { - name = "to-object-reducer"; - packageName = "to-object-reducer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-object-reducer/-/to-object-reducer-1.0.1.tgz"; - sha512 = "BTMQ9u98g/OxjRr68LwQbwOV7cVQ7dIbW1Sj/epj2H6hDbkfbmnxllmUVTUi+f9uipTe8o4g5QJrSdcWZL/D6A=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "token-stream-1.0.0" = { - name = "token-stream"; - packageName = "token-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz"; - sha512 = "VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "void-elements-3.1.0" = { - name = "void-elements"; - packageName = "void-elements"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"; - sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; - }; - }; - "with-7.0.2" = { - name = "with"; - packageName = "with"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-7.0.2.tgz"; - sha512 = "RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "zip-stream-4.1.0" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz"; - sha512 = "zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A=="; - }; - }; - }; -in -{ - "psitransfer-git+https://github.com/psi-4ward/psitransfer#v2.1.2" = nodeEnv.buildNodePackage { - name = "psitransfer"; - packageName = "psitransfer"; - version = "0.0.0"; - src = fetchgit { - url = "https://github.com/psi-4ward/psitransfer"; - rev = "95374e0fb62521b28d7de2272c8df5fc49813771"; - sha256 = "741022797230084b2d47d9beebedbf38b3caa36a87ca7675b77ef6225d269179"; - }; - dependencies = [ - sources."@babel/helper-string-parser-7.21.5" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/parser-7.21.8" - sources."@babel/types-7.21.5" - sources."accepts-1.3.8" - sources."acorn-7.4.1" - sources."any-promise-1.3.0" - sources."archiver-5.3.1" - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - }) - sources."array-flatten-1.1.1" - sources."asap-2.0.6" - sources."assert-never-1.2.1" - sources."async-3.2.4" - sources."asynckit-0.4.0" - sources."axios-0.27.2" - sources."babel-walk-3.0.0-canary-5" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."basic-auth-2.0.1" - sources."bl-4.1.0" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-crc32-0.2.13" - sources."bytes-3.0.0" - sources."call-bind-1.0.2" - sources."character-parser-2.2.0" - sources."combined-stream-1.0.8" - sources."common-streams-1.4.0" - sources."compress-commons-4.1.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."concat-map-0.0.1" - sources."constantinople-4.0.1" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - sources."crc-32-1.2.2" - sources."crc32-stream-4.0.2" - sources."crypto-js-4.1.1" - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."doctypes-1.1.0" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."safe-buffer-5.2.1" - ]; - }) - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."follow-redirects-1.15.2" - sources."form-data-4.0.0" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs-extra-2.1.2" - sources."fs-promise-2.0.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.0" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."http-errors-2.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."is-core-module-2.12.0" - sources."is-expression-4.0.0" - sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."isarray-1.0.0" - sources."js-stringify-1.0.2" - sources."jsonfile-2.4.0" - sources."jstransformer-1.0.0" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - }) - 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.union-4.6.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."meterstream-1.0.1" - (sources."method-override-3.0.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."on-finished-2.3.0" - ]; - }) - sources."ms-2.0.0" - sources."mz-2.7.0" - sources."negotiator-0.6.3" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."proxy-addr-2.0.7" - sources."pug-3.0.2" - sources."pug-attrs-3.0.0" - sources."pug-code-gen-3.0.2" - sources."pug-error-2.0.0" - sources."pug-filters-4.0.0" - sources."pug-lexer-5.0.1" - sources."pug-linker-4.0.0" - sources."pug-load-3.0.0" - sources."pug-parser-6.0.0" - sources."pug-runtime-3.0.1" - sources."pug-strip-comments-2.0.0" - sources."pug-walk-2.0.0" - sources."qs-6.11.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - sources."readable-stream-3.6.2" - (sources."readdir-glob-1.1.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."resolve-1.22.3" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."statuses-2.0.1" - sources."string_decoder-1.1.1" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-stream-2.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-fast-properties-2.0.0" - sources."to-object-reducer-1.0.1" - sources."toidentifier-1.0.1" - sources."token-stream-1.0.0" - sources."type-is-1.6.18" - sources."unpipe-1.0.0" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."vary-1.1.2" - sources."void-elements-3.1.0" - sources."with-7.0.2" - sources."wrappy-1.0.2" - sources."zip-stream-4.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Simple open source self-hosted file sharing solution"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 1ba25683c92..3703618d29a 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-TKK0009ZEFWpzR9jYRanG3sMVp8hQcTd9G/FvUu00tQ="; - arm64-linux_hash = "sha256-u1vjSYu751VoOYsCPyPzcNnmG0rrKk7VgbXMG8X96jU="; - x64-osx_hash = "sha256-IHJ6hZP4DVTotoGxfLLbOveA8TD+6DHXkC+8QqmgTeg="; + x64-linux_hash = "sha256-46BfIsJEgtZMKQdiCqSFdM2whaYRwRLycv0pmY2InDk="; + arm64-linux_hash = "sha256-zTDqbQz966RYV3FSBxmtN9JMe0j0AA21GCz4f0+NnHw="; + x64-osx_hash = "sha256-EKy8vOvCHCcC5PheIdKyr5tWZ18Q+XeKh3mCrqcG7oA="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.1.9.1905"; + version = "0.2.4.1999"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c11326fff2d..7aa78bb2c48 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.1.10"; + version = "23.1.13"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-OlRuJeLvnQeseIsOREt5Frz4zzVmGKQMYIZI4LsDn2U="; + sha256 = "sha256-32/mj1/PeeTrtN9COh/hTL4zFcpLnsS0R2uTGpyMUNk="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/pkgs/servers/rustdesk-server/default.nix b/pkgs/servers/rustdesk-server/default.nix index 12e57263ae5..20f3b525e54 100644 --- a/pkgs/servers/rustdesk-server/default.nix +++ b/pkgs/servers/rustdesk-server/default.nix @@ -1,8 +1,10 @@ -{ lib +{ stdenv +, lib , rustPlatform , fetchFromGitHub , pkg-config , libsodium +, Security , sqlite , nix-update-script , testers @@ -36,6 +38,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsodium sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; passthru = { @@ -53,6 +57,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/rustdesk/rustdesk-server/releases/tag/${version}"; license = licenses.agpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ gaelreyrol ]; + maintainers = with maintainers; [ gaelreyrol tjni ]; }; } diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 4a98e2a436e..f561eec0bac 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -5,14 +5,14 @@ , lib , makeWrapper , monkeysAudio -, perl534Packages +, perlPackages , sox , stdenv , wavpack , zlib }: -perl534Packages.buildPerlPackage rec { +perlPackages.buildPerlPackage rec { pname = "slimserver"; version = "8.3.1"; @@ -25,7 +25,7 @@ perl534Packages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl534Packages.CryptOpenSSLRSA perl534Packages.IOSocketSSL ]; + buildInputs = [ perlPackages.CryptOpenSSLRSA perlPackages.IOSocketSSL ]; prePatch = '' rm -rf Bin diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 1c8722c49e8..43086a891d7 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.33"; + version = "8.0.34"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI="; + hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 300c21f2a87..bf3f4fa3005 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -30,7 +30,8 @@ , svt-av1 , vulkan-loader , libappindicator -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: let diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 740e72179e2..c4f700cf40a 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.46.0"; + version = "1.46.1"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-JA4mTxVlDpD1U360mvLYQv2inZg6VnljAYtVc21Qmfc="; + hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; }; - vendorHash = "sha256-yORh/jxBApu+XeAWczw7BLijNdF9DdoK8CfICBuCitU="; + vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index d2b57a96e70..a65243cee53 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -1,76 +1,101 @@ { lib , stdenv -, fetchzip -, makeWrapper -, which +, fetchFromGitHub +, gitMinimal +, cacert +, yarn +, makeBinaryWrapper , nodejs -, mkYarnPackage -, fetchYarnDeps , python3 , nixosTests }: -mkYarnPackage rec { - pname = "hedgedoc"; - version = "1.9.7"; - - # we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies - # in development and production and the web assets muts be compiled with js-yaml 3 while development - # uses js-yaml 4 which breaks the text editor - src = fetchzip { - url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz"; - hash = "sha256-tPkhnnKDS5TICsW66YCOy7xWFj5usLyDMbYMYQ3Euoc="; +let + version = "1.9.8"; + + src = fetchFromGitHub { + owner = "hedgedoc"; + repo = "hedgedoc"; + rev = version; + hash = "sha256-gp1TeYHwH7ffaSMifdURb2p+U8u6Xs4JU4b4qACEIDw="; }; - nativeBuildInputs = [ which makeWrapper ]; - extraBuildInputs = [ python3 ]; + # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles + offlineCache = stdenv.mkDerivation { + name = "hedgedoc-${version}-offline-cache"; + inherit src; + + nativeBuildInputs = [ + cacert # needed for git + gitMinimal # needed to download git dependencies + nodejs # needed for npm to download git dependencies + yarn + ]; + + buildPhase = '' + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures.os '[ "linux" ]' + yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]' + yarn + ''; + + outputHashMode = "recursive"; + outputHash = "sha256-/jsBFGH/rYSovidmvIf7xpuHpxdW8QFYC08PNi38LH8="; + }; - packageJSON = ./package.json; - yarnFlags = [ "--production" ]; +in stdenv.mkDerivation { + pname = "hedgedoc"; + inherit version src; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = "0qkc26ks33vy00jgpv4445wzgxx1mzi70pkm1l8y9amgd9wf9aig"; - }; + nativeBuildInputs = [ + makeBinaryWrapper + yarn + python3 # needed for sqlite node-gyp + ]; - configurePhase = '' - cp -r "$node_modules" node_modules - chmod -R u+w node_modules - ''; + dontConfigure = true; buildPhase = '' runHook preBuild - pushd node_modules/sqlite3 + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + + # This will fail but create the sqlite3 files we can patch + yarn --immutable-cache || : + + # Ensure we don't download any node things + sed -i 's:--fallback-to-build:--build-from-source --nodedir=${nodejs}/include/node:g' node_modules/sqlite3/package.json export CPPFLAGS="-I${nodejs}/include/node" - npm run install --build-from-source --nodedir=${nodejs}/include/node - popd + + # Perform the actual install + yarn --immutable-cache + yarn run build patchShebangs bin/* runHook postBuild ''; - dontInstall = true; - - distPhase = '' - runHook preDist + installPhase = '' + runHook preInstall mkdir -p $out cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out - cat > $out/bin/hedgedoc <<EOF - #!${stdenv.shell}/bin/sh - ${nodejs}/bin/node $out/app.js - EOF - chmod +x $out/bin/hedgedoc - wrapProgram $out/bin/hedgedoc \ + makeWrapper ${nodejs}/bin/node $out/bin/hedgedoc \ + --add-flags $out/app.js \ + --set NODE_ENV production \ --set NODE_PATH "$out/lib/node_modules" - runHook postDist + runHook postInstall ''; passthru = { + inherit offlineCache; tests = { inherit (nixosTests) hedgedoc; }; }; diff --git a/pkgs/servers/web-apps/hedgedoc/package.json b/pkgs/servers/web-apps/hedgedoc/package.json deleted file mode 100644 index 68c35025ede..00000000000 --- a/pkgs/servers/web-apps/hedgedoc/package.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "name": "HedgeDoc", - "version": "1.9.7", - "description": "The best platform to write and share markdown.", - "main": "app.js", - "license": "AGPL-3.0", - "scripts": { - "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite", - "eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js", - "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done", - "markdownlint": "remark .", - "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit", - "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1", - "dev": "webpack --config webpack.dev.js --progress --watch", - "heroku-prebuild": "bin/heroku", - "build": "webpack --config webpack.prod.js --progress", - "start": "node app.js" - }, - "dependencies": { - "@passport-next/passport-openid": "^1.0.0", - "Idle.Js": "git+https://github.com/shawnmclean/Idle.js", - "archiver": "^5.0.2", - "async": "^3.0.0", - "aws-sdk": "^2.1243.0", - "azure-storage": "^2.7.0", - "base64url": "^3.0.0", - "body-parser": "^1.15.2", - "chance": "^1.0.4", - "cheerio": "^0.22.0", - "clean-webpack-plugin": "^4.0.0", - "compression": "^1.6.2", - "connect-flash": "^0.1.1", - "connect-session-sequelize": "^7.1.2", - "cookie": "^0.5.0", - "cookie-parser": "^1.4.3", - "deep-freeze": "^0.0.1", - "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", - "ejs": "^3.0.0", - "express": ">=4.14", - "express-session": "^1.14.2", - "file-type": "^18.0.0", - "formidable": "^2.0.0", - "graceful-fs": "^4.1.11", - "helmet": "^4.5.0", - "i18n": "^0.15.0", - "is-svg": "^4.3.1", - "jsdom-nogyp": "^0.8.3", - "lodash": "^4.17.20", - "lutim": "^1.0.2", - "lz-string": "git+https://github.com/hackmdio/lz-string.git", - "mariadb": "^3.0.2", - "markdown-it": "^13.0.0", - "markdown-it-abbr": "^1.0.4", - "markdown-it-container": "^3.0.0", - "markdown-it-deflist": "^2.0.1", - "markdown-it-emoji": "^2.0.0", - "markdown-it-footnote": "^3.0.1", - "markdown-it-imsize": "^2.0.1", - "markdown-it-ins": "^3.0.0", - "markdown-it-mark": "^3.0.0", - "markdown-it-mathjax": "^2.0.0", - "markdown-it-regexp": "^0.4.0", - "markdown-it-sub": "^1.0.0", - "markdown-it-sup": "^1.0.0", - "mattermost": "^3.4.0", - "meta-marked": "git+https://github.com/hedgedoc/meta-marked", - "method-override": "^3.0.0", - "minimist": "^1.2.0", - "minio": "7.0.32", - "moment": "^2.17.1", - "morgan": "^1.7.0", - "mysql2": "^3.0.0", - "node-fetch": "^2.6.1", - "passport": "^0.6.0", - "passport-dropbox-oauth2": "^1.1.0", - "passport-facebook": "^3.0.0", - "passport-github": "^1.1.0", - "passport-gitlab2": "^5.0.0", - "passport-google-oauth20": "^2.0.0", - "passport-ldapauth": "^3.0.0", - "passport-local": "^1.0.0", - "passport-oauth2": "^1.4.0", - "passport-saml": "^3.1.2", - "passport-twitter": "^1.0.4", - "passport.socketio": "^3.7.0", - "pdfobject": "^2.0.201604172", - "pg": "^8.2.1", - "pg-hstore": "^2.3.3", - "prom-client": "^14.0.0", - "prometheus-api-metrics": "^3.2.0", - "randomcolor": "^0.6.0", - "readline-sync": "^1.4.7", - "rimraf": "^4.0.0", - "sanitize-filename": "^1.6.3", - "scrypt-kdf": "^2.0.1", - "sequelize": "^5.21.1", - "shortid": "2.2.16", - "socket.io": "^2.1.1", - "sqlite3": "^5.0.8", - "store": "^2.0.12", - "string": "^3.3.3", - "toobusy-js": "^0.5.1", - "umzug": "^2.3.0", - "uuid": "^9.0.0", - "validator": "^13.0.0", - "winston": "^3.1.0", - "xss": "^1.0.3" - }, - "engines": { - "node": "^14.13.1 || 16.x" - }, - "bugs": "https://github.com/hedgedoc/hedgedoc/issues", - "keywords": [ - "Collaborative", - "Markdown", - "Notes" - ], - "homepage": "https://hedgedoc.org", - "maintainers": [ - { - "name": "Claudius Coenen", - "url": "https://www.claudiuscoenen.de/" - }, - { - "name": "Christoph (Sheogorath) Kern", - "email": "codimd@sheogorath.shivering-isles.com", - "url": "https://shivering-isles.com" - }, - { - "name": "David Mehren", - "email": "hedgedoc@herrmehren.de" - } - ], - "repository": { - "type": "git", - "url": "https://github.com/hedgedoc/hedgedoc.git" - }, - "devDependencies": { - "abcjs": "6.1.9", - "babel-cli": "6.26.0", - "babel-core": "6.26.3", - "babel-loader": "7.1.5", - "babel-plugin-transform-runtime": "6.23.0", - "babel-polyfill": "6.26.0", - "babel-preset-env": "1.7.0", - "babel-runtime": "6.26.0", - "bootstrap": "3.4.1", - "bootstrap-validator": "0.11.9", - "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git#hedgedoc/1.9.7", - "copy-webpack-plugin": "6.4.1", - "css-loader": "5.2.7", - "emojify.js": "1.1.0", - "esbuild-loader": "3.0.1", - "escape-html": "1.0.3", - "eslint": "8.34.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-n": "15.6.1", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "6.1.1", - "eslint-plugin-standard": "4.1.0", - "exports-loader": "1.1.1", - "expose-loader": "1.0.3", - "file-loader": "6.2.0", - "file-saver": "2.0.5", - "flowchart.js": "1.17.1", - "fork-awesome": "1.2.0", - "gist-embed": "2.6.0", - "highlight.js": "10.7.3", - "html-webpack-plugin": "4.5.2", - "imports-loader": "1.2.0", - "ionicons": "2.0.1", - "jquery": "3.6.3", - "jquery-mousewheel": "3.1.13", - "jquery-ui": "1.13.2", - "js-cookie": "3.0.1", - "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", - "js-yaml": "3.14.1", - "jsonlint": "1.6.3", - "keymaster": "1.6.2", - "less": "4.1.3", - "less-loader": "7.3.0", - "list.js": "2.3.1", - "mathjax": "2.7.9", - "mermaid": "9.1.7", - "mini-css-extract-plugin": "1.6.2", - "mocha": "10.2.0", - "mock-require": "3.0.3", - "optimize-css-assets-webpack-plugin": "6.0.1", - "prismjs": "1.29.0", - "raphael": "2.3.0", - "remark-cli": "11.0.0", - "remark-preset-lint-markdown-style-guide": "5.1.2", - "reveal.js": "3.9.2", - "select2": "3.5.2-browserify", - "socket.io-client": "2.5.0", - "spin.js": "4.1.1", - "string-loader": "0.0.1", - "turndown": "7.1.1", - "url-loader": "4.1.1", - "velocity-animate": "1.5.2", - "visibilityjs": "2.0.2", - "viz.js": "1.8.2", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.8.0", - "wurl": "2.5.4" - }, - "optionalDependencies": { - "bufferutil": "^4.0.0", - "utf-8-validate": "^6.0.0" - } -} diff --git a/pkgs/servers/web-apps/hedgedoc/update.sh b/pkgs/servers/web-apps/hedgedoc/update.sh deleted file mode 100755 index 5fe1c39d0d6..00000000000 --- a/pkgs/servers/web-apps/hedgedoc/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps jq -set -euo pipefail -cd "$(dirname "$0")" - -if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for the hedgedoc packages." - echo "Usage: $0 [git release tag]" - exit 1 -fi - -version="$1" - -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/hedgedoc/hedgedoc/releases?per_page=1" | jq -r '.[0].tag_name')" -fi - -src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version" - -wget "$src/package.json" -O package.json -wget "$src/yarn.lock" -O yarn.lock - -src_old_hash=$(nix-prefetch-url --unpack "https://github.com/hedgedoc/hedgedoc/releases/download/$version/hedgedoc-$version.tar.gz") -src_hash=$(nix hash to-sri --type sha256 $src_old_hash) -yarn_hash=$(prefetch-yarn-deps yarn.lock) - -sed -i "s|version = \".*\"|version = \"$version\"|" default.nix -sed -i "s|hash = \".*\"|hash = \"$src_hash\"|" default.nix -sed -i "s|sha256 = \".*\"|sha256 = \"$yarn_hash\"|" default.nix - -rm yarn.lock diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 0e2c4c999cf..f68ec501185 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -23,8 +23,8 @@ in }; netbox = callPackage generic { - version = "3.5.4"; - hash = "sha256-CJ7NgKDDEmOFFULaG6wjP5pvGieyU4YRsvmIvqve5qg="; + version = "3.5.6"; + hash = "sha256-n5EJQcC5uVoL5KjGzF7bLF8c4Wke/YBJpx2V9KZz5Qo="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 558ade2b98b..1b5b02b204d 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -5,13 +5,13 @@ let in buildFishPlugin rec { pname = "fzf.fish"; - version = "9.8"; + version = "9.9"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "sha256-xWaMd5POCDeeFTsGtHbIvsPelIp+GZPC1X1CseCo3BA="; + sha256 = "sha256-Aqr6+DcOS3U1R8o9Mlbxszo5/Dy9viU4KbmRGXo95R8="; }; nativeCheckInputs = [ fzf fd unixtools.script procps ]; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index a4139132ed8..2f47dcc6e17 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "4.4.6110"; + version = "4.4.9100"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/0g0LWzw3GbjAIFgNMNzwL8cJNMD1Jwoaaz8lE6ePgU="; + sha256 = "sha256-3YXRjwDEJC4rZdvrgj8Hp8oD+4NN5LOUJmM/9bjwfQw="; }; vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a992a2ea038..291dfa2a7a1 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.82.0"; + version = "0.83.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-D/R+/60Lo2rLUA/313CTJQookqSNtbD7LnVf0vBC9Qc="; + hash = "sha256-+/y4gtcrn6pM+LrzRQuHPACszZpYHCXMLbPlaIi4SAY="; }; - cargoHash = "sha256-LTnBJDA2RkAP3ZCpl5enUc0PLS63EVXQyIopUwBd8OQ="; + cargoHash = "sha256-amDSzsDeG4ABlFLlytcfJV0xA9Rl7Udb/nWEz64pWi0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index ce01f25743c..3c6718d1da8 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -1,17 +1,18 @@ { lib , stdenvNoCC , fetchFromGitHub +, unstableGitUpdater }: stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2023-04-26"; + version = "unstable-2023-07-24"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "724f89c330dc5b93a2fde29f732cbd5b8d73785c"; - hash = "sha256-aCLFbxVE8/hWsPNPLt2Qn8CaBkYJJLSDgpl6LYvFVYc="; + rev = "e6adf4e0ae04f946fcc93a77e0992e2e00467e26"; + hash = "sha256-6hQEBotZyNuBL0vAzqS1C9LLMk2RMv5ZwFCcSI3aSU8="; }; installPhase = '' @@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "A place to share Nushell scripts with each other"; homepage = "https://github.com/nushell/nu_scripts"; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index d14f5f21d80..4f51c3c29d7 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -9,11 +9,11 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.82.0"; + version = "0.83.0"; src = nushell.src; - cargoHash = "sha256-j0FI6Ed8YVIpJ4MBDl6h9qfnolMlPJeoY0Q/qfbGTBA="; + cargoHash = "sha256-h8T3QimN3vyzJEZr63gM5egwjSWI3m3QH2Yp0rwXd90="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index dc8297b0728..3f3596b4d7b 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { runHook preInstall install -D bin/git-forgit $out/bin/git-forgit + install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit + install -D completions/git-forgit.zsh $out/share/zsh/${pname}/git-forgit.zsh install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1f596ada5a0..7fe5f67b14d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1594,7 +1594,7 @@ genericBuild() { if [ "$curPhase" = unpackPhase ]; then # make sure we can cd into the directory - [ -z "${sourceRoot}" ] || chmod +x "${sourceRoot}" + [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" cd "${sourceRoot:-.}" fi diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b6793d25b6e..6bfa1c4393c 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -66,15 +66,7 @@ with pkgs; cuda = callPackage ./cuda { }; - trivial-builders = recurseIntoAttrs { - writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {}; - writeTextFile = callPackage ../build-support/trivial-builders/test/write-text-file.nix {}; - writeShellScript = callPackage ../build-support/trivial-builders/test/write-shell-script.nix {}; - references = callPackage ../build-support/trivial-builders/test/references.nix {}; - overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {}; - concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {}; - linkFarm = callPackage ../build-support/trivial-builders/test/link-farm.nix {}; - }; + trivial-builders = callPackage ../build-support/trivial-builders/test/default.nix {}; writers = callPackage ../build-support/writers/test.nix {}; diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index 86764380ecc..2ecbd4caf81 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -5,6 +5,5 @@ lib.recurseIntoAttrs { cabalSdist = callPackage ./cabalSdist { }; documentationTarball = callPackage ./documentationTarball { }; setBuildTarget = callPackage ./setBuildTarget { }; - writers = callPackage ./writers { }; incremental = callPackage ./incremental { }; } diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix deleted file mode 100644 index f05fda4bc73..00000000000 --- a/pkgs/test/haskell/writers/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Wrap only the haskell-related tests from tests.writers -# in their own derivation for Hydra CI in the haskell-updates -# jobset. Can presumably removed as soon as tests.writers is -# always green on darwin as well: -# https://github.com/NixOS/nixpkgs/issues/126182 -{ runCommand, tests }: - -let - inherit (tests.writers) - writeTest - bin - simple - path - ; -in - -runCommand "test-haskell-writers" { - meta = { - inherit (tests.writers.meta) platforms; - }; -} '' - ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} - ${writeTest "success" "test-haskell-simple-writer" simple.haskell} - ${writeTest "success" "test-haskell-path-writer" path.haskell} - touch $out -'' diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index ae0e913a760..cb004dc3c97 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -321,4 +321,54 @@ echo "tested $binCount binCount: $ignoredCount ignored, $brokenCount broken, $failedCount failed" [[ $failedCount = 0 ]] ''; + + # verify that the precomputed licensing information in default.nix + # does indeed match the metadata of the individual packages. + # + # This is part of the test suite (and not the normal evaluation) to save + # time for "normal" evaluations. To be more in line with the other tests, this + # also builds a derivation, even though it is essentially an eval-time assertion. + licenses = + let + concatLicenses = builtins.foldl' (acc: el: if builtins.elem el acc then acc else acc ++ [ el ]); + # converts a license to its attribute name in lib.licenses + licenseToAttrName = license: + builtins.head (builtins.attrNames + (lib.filterAttrs (n: v: license == v) lib.licenses)); + lt = (a: b: a < b); + + savedLicenses = scheme: scheme.meta.license; + savedLicensesAttrNames = scheme: map licenseToAttrName (savedLicenses scheme); + + correctLicenses = scheme: builtins.foldl' + (acc: pkg: concatLicenses acc (lib.toList (pkg.meta.license or []))) + [] + scheme.passthru.packages; + correctLicensesAttrNames = scheme: + lib.sort lt + (map licenseToAttrName (correctLicenses scheme)); + + hasLicenseMismatch = scheme: + (lib.isDerivation scheme) && + (savedLicensesAttrNames scheme) != (correctLicensesAttrNames scheme); + incorrectSchemes = lib.filterAttrs + (n: hasLicenseMismatch) + texlive.combined; + prettyPrint = name: scheme: + '' + license info for ${name} is incorrect! Note that order is enforced. + saved: [ ${lib.concatStringsSep " " (savedLicensesAttrNames scheme)} ] + correct: [ ${lib.concatStringsSep " " (correctLicensesAttrNames scheme)} ] + ''; + errorText = lib.concatStringsSep "\n\n" (lib.mapAttrsToList prettyPrint incorrectSchemes); + in + runCommand "texlive-test-license" { + inherit errorText; + } + (if (incorrectSchemes == {}) + then "echo everything is fine! > $out" + else '' + echo "$errorText" + false + ''); } diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/tools/X11/sunpaper/default.nix index 9f760bb4a93..116b0225ab0 100644 --- a/pkgs/tools/X11/sunpaper/default.nix +++ b/pkgs/tools/X11/sunpaper/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , sunwait , wallutils -, rPackages }: stdenvNoCC.mkDerivation rec { @@ -27,7 +26,7 @@ stdenvNoCC.mkDerivation rec { --replace "sunwait" "${sunwait}/bin/sunwait" \ --replace "setwallpaper" "${wallutils}/bin/setwallpaper" \ --replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" - ''; + ''; installPhase = '' mkdir -p "$out/bin" "$out/share/sunpaper/images" diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index 9cc7ffb38eb..db1c7beb2a5 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { "jsonschema" "pathspec" "python-json-logger" - "pyyaml" + "PyYAML" "toolz" "unidiff" "yamllint" diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index ac119e7d1c3..e65cac675db 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,39 +1,17 @@ { lib , python3 -, fetchFromGitHub , fetchPypi , groff , less }: -let - py = python3.override { - packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.4.1"; - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - hash = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; - }; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all - runHook postCheck - ''; - }); - }; - self = py; - }; -in -with py.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.27.79"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.29.9"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-A3MVM5MV+PTwR4W2ALrqEtMaFtVAEt8yqkd4ZLsvHGE="; + hash = "sha256-8SmOu79FZESL1Hd15wdd1m1Uewswqaum2y8LOZAl9P8="; }; # https://github.com/aws/aws-cli/issues/4837 @@ -44,11 +22,10 @@ with py.pkgs; buildPythonApplication rec { --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ botocore bcdoc s3transfer - six colorama docutils rsa @@ -68,14 +45,15 @@ with py.pkgs; buildPythonApplication rec { ''; passthru = { - python = py; # for aws_shell + python = python3; # for aws_shell }; doInstallCheck = true; + installCheckPhase = '' runHook preInstallCheck - $out/bin/aws --version | grep "${py.pkgs.botocore.version}" + $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" $out/bin/aws --version | grep "${version}" runHook postInstallCheck diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 746b1ed6b09..2688c189f5a 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -10,8 +10,13 @@ let py = python3 // { - pkgs = python3.pkgs.overrideScope (self: super: { - # nothing right now + pkgs = python3.pkgs.overrideScope (final: prev: { + ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: { + src = prev.src.override { + version = "0.17.21"; + hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + }; + }); }); }; @@ -29,8 +34,8 @@ with py.pkgs; buildPythonApplication rec { }; postPatch = '' - substituteInPlace requirements/bootstrap.txt \ - --replace "pip>=22.0.0,<23.0.0" "pip>=22.0.0,<24.0.0" + substituteInPlace pyproject.toml \ + --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' ''; nativeBuildInputs = [ @@ -74,8 +79,6 @@ with py.pkgs; buildPythonApplication rec { rm $out/bin/aws.cmd ''; - doCheck = true; - preCheck = '' export PATH=$PATH:$out/bin export HOME=$(mktemp -d) @@ -107,7 +110,7 @@ with py.pkgs; buildPythonApplication rec { tests.version = testers.testVersion { package = awscli2; command = "aws --version"; - version = version; + inherit version; }; }; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index fcfc16f7e82..786620088a1 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -14,7 +14,7 @@ let # put packages that needs to be overridden in the py package scope py = import ./python-packages.nix { - inherit stdenv lib src version python3 fetchPypi; + inherit stdenv src version python3 fetchPypi; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 3fbd9e8f1ac..303e0ffacc3 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchPypi, lib, src, version }: +{ stdenv, python3, fetchPypi, src, version }: let buildAzureCliPackage = with py.pkgs; buildPythonPackage; diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 8246707fec0..e11172e5070 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -15,12 +15,12 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-/Die6tpidmt3dTzW7mEnQJG5vlxue4sT44PcAa7lrgk="; + x86_64-linux = "sha256-USljQ/cnbSabzsZWXlZ0eeZSqkTr3wVP0ktXqZ7Fw4U="; x86_64-darwin = "sha256-VB5075VfQRtlLoG3lfkVz8ASoODiwleTYC2JJR51LtI="; aarch64-darwin = "sha256-VB5075VfQRtlLoG3lfkVz8ASoODiwleTYC2JJR51LtI="; }.${system} or throwSystem; - version = "16.7.5"; + version = "16.7.6"; src = fetchzip { url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; inherit sha256; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index f87723cc310..c2849d6afd4 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/tools/admin/cw/default.nix index 413fad40dcc..1a194136941 100644 --- a/pkgs/tools/admin/cw/default.nix +++ b/pkgs/tools/admin/cw/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cw"; diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index fae0ce1f7b9..1b28cdcc4fe 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -19,9 +19,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index 2beecd158bc..b565fd0ee02 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -93,9 +93,7 @@ python.pkgs.buildPythonApplication rec { passthru = { inherit python; - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = gimme-aws-creds; command = ''touch tmp.conf && OKTA_CONFIG="tmp.conf" gimme-aws-creds --version''; diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index bd216050b20..e8d400d7f66 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -3,7 +3,7 @@ let python = python3.override { packageOverrides = self: super: { - pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { + pyparsing = super.pyparsing.overridePythonAttrs rec { version = "2.4.7"; src = fetchFromGitHub { owner = "pyparsing"; @@ -14,7 +14,7 @@ let nativeBuildInputs = [ super.setuptools ]; - }); + }; }; }; in diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index f4e5bca7307..2b25d65a7f2 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -1,12 +1,10 @@ -{ stdenv -, lib -, google-cloud-sdk +{ lib +, stdenv , system , snapshotPath , autoPatchelfHook , python3 , libxcrypt-legacy -, ... }: let @@ -143,7 +141,7 @@ let { url = src; inherit sha256; - }) ; + }); dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 9401523e345..f354dde039c 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix index 1260f9673a2..c71f23c978b 100644 --- a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix +++ b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix @@ -1,4 +1,4 @@ -{ lib, google-cloud-sdk, callPackage, runCommand, components }: +{ lib, google-cloud-sdk, runCommand, components }: comps_: diff --git a/pkgs/tools/admin/hop-cli/default.nix b/pkgs/tools/admin/hop-cli/default.nix new file mode 100644 index 00000000000..eea6a9e7366 --- /dev/null +++ b/pkgs/tools/admin/hop-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, CoreServices +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "hop-cli"; + version = "0.2.52"; + + src = fetchFromGitHub { + owner = "hopinc"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-xuOkW5jetl+8obeFJnbkVZa+wYWfTNiTOmcrzC8+wGE="; + }; + + cargoHash = "sha256-ePUlw4UzsQ2lNuJ5g5OAYh6nKTIoHdDMb34Jzuqtas8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices Security + ]; + + OPENSSL_NO_VENDOR = 1; + + checkFlags = [ + # This test fails on read-only filesystems + "--skip=commands::volumes::utils::test::test_parse_target_from_path_like" + ]; + + meta = with lib; { + mainProgram = "hop"; + description = "Interact with Hop in your terminal"; + homepage = "https://github.com/hopinc/cli"; + changelog = "https://github.com/hopinc/cli/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix new file mode 100644 index 00000000000..9df1c4da54c --- /dev/null +++ b/pkgs/tools/admin/ibmcloud-cli/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchurl +, installShellFiles +}: +let + arch = with stdenv.hostPlatform; if isx86_64 then "amd64" + else if isAarch64 then "arm64" + else if isi686 then "386" + else if isPower64 && isLittleEndian then "ppc64le" + else if isS390x then "s390x" + else throw "Unsupported arch: ${stdenv.hostPlatform.system}"; + platform = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "macos_arm64" + else if stdenv.hostPlatform.isDarwin then "macos" + else "linux_${arch}"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "ibmcloud-cli"; + version = "2.17.0"; + + src = fetchurl { + url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; + sha256 = { + "x86_64-darwin" = "18f0dylgwwn9p1jmchqhq061s435n85qr2872i532whbrziwwjf3"; + "aarch64-darwin" = "1rid6rv601z4ayd3yi5srqbfn5bspypxarikvm563ygxawh1bxyi"; + "x86_64-linux" = "0ry8ix5id2zk04w9d9581g127f9jpj7bwg3x0pk3n9yfwn61g96d"; + "aarch64-linux" = "0s5jaqhyl234670q1mg89in2g5b9w3gzvnzl8qmlmgqkaxvzxj94"; + "i686-linux" = "0iw8y7iy9yx7y8v8b2wfl24f2rv9r20yj7l4sislxspfyvqv54p2"; + "powerpc64le-linux" = "19ac0na163l9h7ygbf3jwwv7zf0wagqvn6kcdh871c690i86wg9z"; + "s390x-linux" = "1zvy28jpxijzgdbr9q4rfyx6mk295mqp4nk8z299nm9ryk4q81lv"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + install -D ibmcloud $out/bin/ibmcloud + mkdir -p $out/share/ibmcloud + cp CF_CLI_Notices.txt CF_CLI_SLC_Notices.txt LICENSE NOTICE $out/share/ibmcloud + export HOME=$(mktemp -d) + installShellCompletion --cmd ibmcloud --bash <($out/bin/ibmcloud --generate-bash-completion) + + runHook postInstall + ''; + + meta = with lib; { + description = "Command line client for IBM Cloud"; + homepage = "https://cloud.ibm.com/docs/cli"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "powerpc64le-linux" "s390x-linux" ] ++ platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "ibmcloud"; + }; +}) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index b06c2fde645..31721c6e7aa 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -1,23 +1,22 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub -, lib , testers , kics }: buildGoModule rec { pname = "kics"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-IYyGZ0eJcGLQoQyfgbwxzzoEZ2dUKLlEaZ4NhuP5Q30="; + sha256 = "sha256-h6ZnaknqMcW+Zp2t5RHPK/e/Ilw5yWY2fcSTJe2mVR4="; }; - vendorHash = "sha256-cMKEUH/teEfyhHgBz3pMD8sotZ51t6O+4EiQ9BJt2Qg="; + vendorHash = "sha256-ipXfxqHdushJ2P//oyGGjZsq5EypDEpHKlW32VHaMXw="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4ef0fb7a583..b80aa878232 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.12.3"; + version = "4.13.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H6JGeLE/fzbfo8/mn5hTKcr7XfvmjOojeXLxUKGzt4w="; + sha256 = "sha256-nFRDA0EHV1i9mcl1i5WpfhTNseU9E9jmlPd1xFbkCaM="; }; - vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w="; + vendorHash = "sha256-mjCxe4hCCIcjVDWVizqqqo6/kn8iS8s32urMtDD5yq4="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 7d4c10688b8..02bf8cbd4e6 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,14 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.15"; + version = "5.16"; src = fetchurl { - urls = [ - "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" - "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" - ]; - hash = "sha256-ez/875yu0XYu5ORf4ak6RN1jWGxuGk0n9023zJkoluM="; + url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; + hash = "sha256-evtNPZvnx8rzr/tJkEp0E7BhUBWHBSJdMtZJQk3VZI8="; }; vendorHash = null; @@ -35,7 +32,7 @@ buildGoModule rec { --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" ''; - excludedPackages = [ "test" "lxd/db/generate" ]; + excludedPackages = [ "test" "lxd/db/generate" "lxd-agent" "lxd-migrate" ]; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ @@ -52,10 +49,15 @@ buildGoModule rec { tags = [ "libsqlite3" ]; preBuild = '' - # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 + # required for go-dqlite. See: https://github.com/canonical/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" ''; + # build static binaries: https://github.com/canonical/lxd/blob/6fd175c45e65cd475d198db69d6528e489733e19/Makefile#L43-L51 + postBuild = '' + make lxd-agent lxd-migrate + ''; + preCheck = let skippedTests = [ "TestValidateConfig" @@ -78,14 +80,14 @@ buildGoModule rec { passthru.tests.lxd-ui = nixosTests.lxd-ui; passthru.ui = callPackage ./ui.nix { }; passthru.updateScript = gitUpdater { - url = "https://github.com/lxc/lxd.git"; + url = "https://github.com/canonical/lxd.git"; rev-prefix = "lxd-"; }; meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = "https://linuxcontainers.org/lxd/"; - changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; + homepage = "https://ubuntu.com/lxd"; + changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; maintainers = with maintainers; [ marsam adamcstephens ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index 3ffcb00a9e3..a6d41659a9d 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -33,8 +33,7 @@ mkYarnPackage rec { meta = { description = "Web user interface for LXD."; - homepage = "https://linuxcontainers.org/lxd/"; - changelog = "https://github.com/canonical/lxd-ui"; + homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 62e0d302486..5d511368ef1 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_18, jq, dos2unix }: +{ lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }: yarn2nix-moretea.mkYarnPackage { version = "1.1.6"; diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/tools/admin/ossutil/default.nix index 478c7d46c81..be5f8f91402 100644 --- a/pkgs/tools/admin/ossutil/default.nix +++ b/pkgs/tools/admin/ossutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { version = "1.7.16"; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 81dbd7a7009..ee650446ee7 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "7.4"; + version = "7.5"; yarnSha256 = "sha256-rEKMUZksmR2jPwtXy6drNwAJktK/3Dee6EZVFHPngWs="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-ksvSDySutTB9QX0Gh9jBjGlDyG/vEMhgadu91iNvznw="; + hash = "sha256-o8jPqp4jLF/lZ0frCzPDCSxCy51Nt0mbdeNB44ZwNHI="; }; # keep the scope, as it is used throughout the derivation and tests @@ -63,9 +63,13 @@ pythonPackages.buildPythonApplication rec { # relax dependencies sed 's|==|>=|g' -i requirements.txt - #TODO: Can be removed once cryptography>=40 has been merged to master + #TODO: Can be removed once boto3>=1.28.0 and cryptography>=41 has been merged to master substituteInPlace requirements.txt \ - --replace "cryptography>=40.0.*" "cryptography>=39.0.*" + --replace "boto3>=1.28.*" "boto3>=1.26.*" + substituteInPlace requirements.txt \ + --replace "botocore>=1.31.*" "botocore>=1.29.*" + substituteInPlace requirements.txt \ + --replace "cryptography>=41.0.*" "cryptography>=40.0.*" # fix extra_require error with "*" in match sed 's|*|0|g' -i requirements.txt substituteInPlace pkg/pip/setup_pip.py \ diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 2e321853a8e..1a1241b3829 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,104 +1,104 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.72.1"; + version = "3.76.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-linux-x64.tar.gz"; - sha256 = "1gr0ynim2dm182077bvbxykl91md032lr5h23s5mz0sf06j48r87"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-linux-x64.tar.gz"; + sha256 = "1h2h6g7fdxdm5298mar6zcqxy4givk87105q93l02l31k46mydgw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-linux-amd64.tar.gz"; - sha256 = "147i9cz1j0bj4bzkp3rj00w9mhghvh56arszslww4f89ys75isc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-linux-amd64.tar.gz"; + sha256 = "056284cllv3jgm0w4piikfzfxj4j7jy5km06b9v85ykscgdmf2x9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-linux-amd64.tar.gz"; - sha256 = "0bkgygq3i8sjlx8yi95m760v74kx8rya5lvhwh4139xb3d8863i4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-linux-amd64.tar.gz"; + sha256 = "159wx1sa2bw55zp9janm4wzz1hgqbdvmzlmg8shxc3ny1i7np98g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-linux-amd64.tar.gz"; - sha256 = "1x70s33qhyj9qpbh2vy6lj5pwr1cxwzxzn58c5mmz5x984x7v1zc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-linux-amd64.tar.gz"; + sha256 = "164ma8nsi8bg85wpb2w054lbrqa0yzssmlx8kb99b6rci01m4c2p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-linux-amd64.tar.gz"; - sha256 = "0fhyvbky5482swz4ghd35qiwmr94dlvcm070q04a98j8pb1nv87l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-linux-amd64.tar.gz"; + sha256 = "0zhvp0pq8nnx10wkh1if1jzxgwdkibm8gd5b25yacncg3190rj6w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-linux-amd64.tar.gz"; - sha256 = "06dzs92a58p9jllwwv3bvzxi56yzrv37imwxw0hxabqp7fm8pfhm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-linux-amd64.tar.gz"; + sha256 = "0zd8g62i4f39979mmk517dbw86aqizviiclism4pji3xas77p7m0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-linux-amd64.tar.gz"; - sha256 = "154y3qlddz2lqa1qnm0w762w858g72x6iczs2jz7gcfbvlghryij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-linux-amd64.tar.gz"; + sha256 = "0yhzmiiic7nvqcdxfrsbwgxnd1d3fqb1z9zn2j7iavp2clkf67ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-linux-amd64.tar.gz"; - sha256 = "0j2kzbymfqdh9mgjm8akalbwij8gzfics9w60plpi6adwg08skdx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-linux-amd64.tar.gz"; + sha256 = "1mjwsz3v1mr0iyaklv74455v29nlqx1hysjj33fal0j429wbwaz2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-linux-amd64.tar.gz"; - sha256 = "0a1z89005769fc5j58jv67cz2gjggzw8nxyxm8aby0nfl5qsip3d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-linux-amd64.tar.gz"; + sha256 = "1sy0zj483gwv675ib40wb5ppjx31yh56p42538kxb9208ah1xcp0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-linux-amd64.tar.gz"; - sha256 = "1wgfxkrbv409vzm2b45jaxp6vxf5cnfyl7mpbgr68vadpam0qv1l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-linux-amd64.tar.gz"; + sha256 = "1cdka8jiq9gxx8iqsvvc7klkjkkria3w3d4fxa6xx82y7g2kia4s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-linux-amd64.tar.gz"; - sha256 = "1z42nbgl3anwa8zx0l8kbd1zi3f9i74cvd3lgfnix5g5jd3gacxc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-linux-amd64.tar.gz"; + sha256 = "1y1mh7jyhh86528nf21lvi5b17mwlc4q8n5143jvnxvxpnn90jzf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-amd64.tar.gz"; sha256 = "1ld9zss8qfj3a3v75a09b3py266ba5ghdrj1d7vj9rdgid8xlxlq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-linux-amd64.tar.gz"; - sha256 = "07220y0nv4p6g92s0g9aviha9r3rapj0kk4wid7qihj5kg607h8c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-linux-amd64.tar.gz"; + sha256 = "0vndpw6xc9iz69rfawkjihxs7gq8mch5z8qi742yicygw5hsmr58"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-linux-amd64.tar.gz"; - sha256 = "1sv8g0dybvmwsllicjfc0vf6libigwh3nazs0s4p177x6pcvlsml"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-linux-amd64.tar.gz"; + sha256 = "1jlqclpr30vj0danzi242kj4yf291vi7hiahzm81dlwi1s7ychh6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-linux-amd64.tar.gz"; - sha256 = "0yfksasj440509k0jkw4v8h917bdyp6jsvv0bi6r14g94izdm6yx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-linux-amd64.tar.gz"; + sha256 = "0dqp2sqw49jcc4sahi0xrifs989jpnd3lrfvv924m5vjj55prif8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-linux-amd64.tar.gz"; - sha256 = "14636lffz2gsnippb40m0kpdzynzj2qi7v67x9skfn426glhfq0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-linux-amd64.tar.gz"; + sha256 = "100yr0ancgssylla3na92d5l2vv3qb55ckmjprl314z3ki5azfdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-linux-amd64.tar.gz"; - sha256 = "0wiqryn2szblm8cyy4pyg5x1gj0pfgffzx3jg7in6asxzpqwkw0m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-linux-amd64.tar.gz"; + sha256 = "0sn7n5gm9x655pc5jhb66w7r707hbnljpxg16dphav38ccm6ich4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-linux-amd64.tar.gz"; - sha256 = "0vfkv0cz8akssxaddfqvjk3xrb2didsiwisfc3wn7cg8ilgy7x7k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-linux-amd64.tar.gz"; + sha256 = "1v8qddz1fpm10hzqmg1khl9jvxvgb4v5dgbg9hxgbpc31i3bpn28"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-linux-amd64.tar.gz"; - sha256 = "0nrixy5jv91jdq0qq2v244nahrlz5lprihzsry1gacdkzgarw86l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-linux-amd64.tar.gz"; + sha256 = "05zn312baszcsly6ix6211x2xdjj7ll11aykyp98f91cyia9klcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-linux-amd64.tar.gz"; - sha256 = "0glf41791pm6pi1pwr83xbjwn934a4z00kjqk0n4a108fmf17pg8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-amd64.tar.gz"; + sha256 = "1xq92rsk7bimkr52c13mjypd0ygs7qc9ijyi2ghnf0585d1z5bk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-linux-amd64.tar.gz"; - sha256 = "0r3aqbjy2slpm0pfc0znx44b2xlqcmaqzpaazgj7ggqn2048jvf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-linux-amd64.tar.gz"; + sha256 = "1jpwygcg82yxwrjq5sazijbwk92m4vfdlhslj0hbfgdj4xbi70rf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-linux-amd64.tar.gz"; - sha256 = "1nsncg2njppczs7l532z8dl3g7q1a57hnmam5wq7mqx3408x7jb6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-linux-amd64.tar.gz"; + sha256 = "1m8gfw7jkxljh1wbqbaj9njkwcj9ii535fillkmn92p049izw0xj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-linux-amd64.tar.gz"; - sha256 = "003sin31fjnz4m2cc780digdgc59rmkgm82n91v7y3pv9mj7d2np"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-linux-amd64.tar.gz"; + sha256 = "1x50ayk6vla5j2b9ld890vsyl2m47k39g5cwwhpvdy3zbsnb39d9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; @@ -113,24 +113,24 @@ sha256 = "0hsf00j8hs4l9ln8vab9syl14b83xmvxql342gvi4rcz291gff3p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0yrzdbcvg16a2v7hc6rq4cmavimkj4hjxd3kfkw8gd2cbi4kcmwf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-linux-amd64.tar.gz"; + sha256 = "13c7c4ddp07rf6vfca16gax270253l7rd9bb068fgg25d6fcfzgw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-linux-amd64.tar.gz"; sha256 = "1a1l07v0hbay0gxvr05mrknllq6vqkyjbv9486klsdswqr9l4p6n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-linux-amd64.tar.gz"; - sha256 = "16vrb5c22gj67q3458rkgzin5d3ml4vm1wi860fy43fk875r5q53"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-linux-amd64.tar.gz"; + sha256 = "17ny01652c9wls1zr9m5v9al6l7x5awydpw3fkp685ygvasnbnj3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-linux-amd64.tar.gz"; - sha256 = "1mjjfrx32sc4g6bmnjd52wd4hxjyk83f6gwl0apjzasxr06xkq0a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-linux-amd64.tar.gz"; + sha256 = "138pgczdayy2yx92y9syqx7xdj4giqpg6fks66g67cvk88jhl2nz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-linux-amd64.tar.gz"; - sha256 = "05zmzhqnpmpwhjw4467sryxl20kswdn770lm83h5zn5c1i0kgpw0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-linux-amd64.tar.gz"; + sha256 = "02rvbvshg7bcdjx45d1fkvhf6vdqw68a0zfyp08h67vagx8l2dxv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-linux-amd64.tar.gz"; @@ -141,16 +141,16 @@ sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-linux-amd64.tar.gz"; - sha256 = "0d6aw10x2lksn940818hnil4fhmswkhpxkz7v0inc5iz3lclpjni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-linux-amd64.tar.gz"; + sha256 = "08i5ja0lmwncfi8c05485sw08b6r9590wvcr342n1mvgljv7mqc0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-amd64.tar.gz"; sha256 = "01jsl59rwns87ybx1hmfr634ma381i7xmx40ahrrfpg851mzsgig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-linux-amd64.tar.gz"; - sha256 = "020mya26d9jzwivgjnz6diyk8dq6zslw62qjr45a8ygk9hwfbmmk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-linux-amd64.tar.gz"; + sha256 = "0sgzzqfq26dykzc4ij98ksnhv92d6c4n74pjwag2pfy78yzrm7rl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-linux-amd64.tar.gz"; @@ -163,100 +163,100 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-darwin-x64.tar.gz"; - sha256 = "145pgphsd33cqba9hs3mwfs7i3i23sfj16ps894k7yl6nr2r04il"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-darwin-x64.tar.gz"; + sha256 = "1z1915lllvhg5isl3zxp4nnpqrbm4yfj4wq00zg5pdaamvnf7yig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-darwin-amd64.tar.gz"; - sha256 = "1kfs09r7v8b93xrrz2wlp7x723pfmpzjcb0avkjj2zr0nq4wa96f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-darwin-amd64.tar.gz"; + sha256 = "0idzbwf0ygnajqn7w7j7q3z8ap37ji18vlxf0rmbld12404lmnlb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "141dafxbam67qn9929vx02zkpm63zdiixl7lp5gdqqxls11zw3kq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "055lfa13ijl90yli2vm6h18565gzsp440x82bl21lhdvjmd97rq7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-darwin-amd64.tar.gz"; - sha256 = "09rzfgh2fyx7hzix3c98az47xdxpdhgd9pgk925qjq7lz61q4kvc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-darwin-amd64.tar.gz"; + sha256 = "0w62sxbdmjzqms1g6sa7b229vm8mja7yfcry42k396jmlpf748sr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-darwin-amd64.tar.gz"; - sha256 = "0mgm4gdkph5zkls5g9bf202pjdkqwhp3lndjx04n5d8ryzhaa154"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "14jhqb7zbgc4yf44h6lmdlmh799v9c80xyrdndr54yj1mz7d9nfr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-darwin-amd64.tar.gz"; - sha256 = "0dyd5p8acycvyn1g449kiqh5m30sc4h964hv65ac1j1fi3al3978"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-darwin-amd64.tar.gz"; + sha256 = "0k65d3gl29fkb3vf132mwxklz0im8zdmkjgw92npvqan62bvg9gk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-darwin-amd64.tar.gz"; - sha256 = "06xqyz2j96h6i9hjwgj77l0w9m9qks8jbb37ppx85vfqzn1y0msp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-darwin-amd64.tar.gz"; + sha256 = "0c8hmkqifms6y5wb5rw2xm2as1zrr91q94ikig9p02qv0g0m63n8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-darwin-amd64.tar.gz"; - sha256 = "1qyzv0s664s1cc5z6gxq48wc3v2rmz5mdnlbgmkivd79gyyapaa7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-darwin-amd64.tar.gz"; + sha256 = "0qx9jbhj86nzw1vprji1ybpp8ailnn66jr3kff80cm6nms2afcd4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "0cwar1wf9xsrwvk5pk4lj8lnhd1i55nkvrp59jmk04a6lgr18b0g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-darwin-amd64.tar.gz"; + sha256 = "1ak4ca47d15cv1ymm5r2rrakzdln2spky1jyi5drs5h292xrajgj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-darwin-amd64.tar.gz"; - sha256 = "07a38ar4ny02rnq8pxx9yizz3b5frzaafxs4cmi0xgmxghz8csm2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-darwin-amd64.tar.gz"; + sha256 = "1v37hwzj6z3dih80fvs7lf3kpjka12279zql0p2vf5frkch3yrdm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-darwin-amd64.tar.gz"; - sha256 = "1v5jhn3m9x07wxhn40rpv08rd2rqdzn2lnaa6z45g2hpyglbmzfn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-darwin-amd64.tar.gz"; + sha256 = "18x8zrhqd4l3kb2jr5lkxg4zvp3mybr3zlyx5qi2rkax8bqn4amz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-amd64.tar.gz"; sha256 = "0v5h4jd1yyinchq332svcvcr1rw22xz6qv8c2660p0i50hhakv1p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-darwin-amd64.tar.gz"; - sha256 = "0yyh94xngwdrscl46hi5laxi507c138pqpzswgbji80vchlhh7n4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-darwin-amd64.tar.gz"; + sha256 = "03r639yn0maqhlxfnmld7hhrms5gnajw9sqgw3k40xj8rfiiw6ar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-darwin-amd64.tar.gz"; - sha256 = "028k7i3h1r15dvc34g7fz9k7d1qil4ll6avjxarm17gb1c2w1pmw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-darwin-amd64.tar.gz"; + sha256 = "1sj8qjsjypg5ijxc6kv23hxr6qpky46w79mzcyaba0qhw0pffmaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-darwin-amd64.tar.gz"; - sha256 = "0slwbpwh73jrj4xp5lpih8gv8jms6krq0r0dmppvq2ihzr7l2kxz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "00jx9xvkl2bk1jvi9crcn5b5rp67i2gnfmicskjz801lmcca7dia"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-darwin-amd64.tar.gz"; - sha256 = "19dgli3xwqs5491sd5z9ivmakqnlm3hqhk0hxnx7bfdd8azicay5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-darwin-amd64.tar.gz"; + sha256 = "0h65ixspip86xbvmywpv95vbdcdwfpg5x81k0960l1mzgw2brf2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-darwin-amd64.tar.gz"; - sha256 = "1s4bldc9j0ny3yvq53iglxh50ccrmx8qsfcjjddg29g4n4qv79zf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-darwin-amd64.tar.gz"; + sha256 = "1jc77321nrm09gw2qz34dr2npncrhr922fz6f0fxp5xr6g5j5cqa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-darwin-amd64.tar.gz"; - sha256 = "0yfw903dak0gd6i99w3j7inkqy7ip6p38gzr39p52abi1s8d2d2b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-darwin-amd64.tar.gz"; + sha256 = "0pg6idwgyxi5ifcyn7fhhimbb3p4ldmiwdy6ll5iiaf8xdk4h4cg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-darwin-amd64.tar.gz"; - sha256 = "0zpk35rlz8a2ar3rszr4yysam5z1bgw28h3zhylprzjapfvjbh21"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-darwin-amd64.tar.gz"; + sha256 = "17pzmy1nad6r1a1giy45bn78f0dc6isnwn2ym7pc86nbf199m7rg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-darwin-amd64.tar.gz"; - sha256 = "1msnkvvw4zxcj67k382y1hgrcgljsk9rbkahn9rfrwf0fay72ldv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-amd64.tar.gz"; + sha256 = "18vqn7cs5l6fyxmplvcmb779sa91ka8vzz40giggdxzsdjjj9dpx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-darwin-amd64.tar.gz"; - sha256 = "0911c5xfagw6w08mnnnwp1jns6z6qkmvs8v955qczagqf12aqfn3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-darwin-amd64.tar.gz"; + sha256 = "0i9is2gj51fwy0nill9vhi65clqlx8iqwa6cvvd5x4qqh8mfslma"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-darwin-amd64.tar.gz"; - sha256 = "00gn1dlaxl6jb6744qdyrc5jsgnpjxmm60zx7lp253bnj6qa9wnk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-darwin-amd64.tar.gz"; + sha256 = "13jl22xzifgl4l3kizxdsk2cfqi5vlfngkka05p6d9zh3v5kz2v7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "1li9wcsra16driikq52a1xi360awjk2kb2jbgg3glg36ng6c9rn4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-darwin-amd64.tar.gz"; + sha256 = "0d4j4njn19kxyxjgaw2m0xxr68s2i90dq1n9yyvk1d6rh6m55hlx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; @@ -271,24 +271,24 @@ sha256 = "08m0xpra2c93j258nq8lcz4yfp8chl0kyq4csc625jmp0wx1fdfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "0q9hjfyn4r14fplxx597kjy8g3jpcps4bp7gsyy4ri8fipldjnf3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-darwin-amd64.tar.gz"; + sha256 = "1g4baplhlgp8mxgb31sw1zinpdzzam7xcnc50i1xhr89i33zxfxy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-darwin-amd64.tar.gz"; sha256 = "0xdz6l3d646mmzn9llfw2zpgr8dk2drqkhf8fff9xljy736qc2zn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-darwin-amd64.tar.gz"; - sha256 = "1hvzpshc28yq1y9636k9mbwgkpbp6gnka3q5mqpmsmp51g3pw751"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-darwin-amd64.tar.gz"; + sha256 = "14w5mzm2im86pxnlj7qzwdlq77lsnqjznb1mv3fyq5c43maf8d22"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-darwin-amd64.tar.gz"; - sha256 = "0a8q6yad8xak8m6aiq39ifnf2vy9aa6y3yssiq5pr9n9z51chfkk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-darwin-amd64.tar.gz"; + sha256 = "17jbd4i6wri9gfx8rh4aanmd97y66pzi286dsfprfi1m9gs8x3hz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-darwin-amd64.tar.gz"; - sha256 = "10xc481va5yvla73kx4d9n1mbscf5sxmrgfapb13nh4f8ic6rkzb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "1l6v7n4ch6z70amgrzp6lp181qwnip6vizj3cmdy3zaqyg49r1gx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-darwin-amd64.tar.gz"; @@ -299,16 +299,16 @@ sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-darwin-amd64.tar.gz"; - sha256 = "1m5pgah9q31kc4d3m5s74qqlax00r2x8i8y07pmb8g3fjr9hvk1s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-darwin-amd64.tar.gz"; + sha256 = "1vvqcn832snkqkk0d1rgx6wraxxy2j0nss4zjqyin8wvhrd7ddak"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-amd64.tar.gz"; sha256 = "1jn1j72s3dqjw0xdyk7mncw61fzqmwg4sqbbh7f3708wv1rznv5a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "04l94yi47hpk6ih67iqlx6fv8i9qzb3bcwph17xwzf5sqx09n0cw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-darwin-amd64.tar.gz"; + sha256 = "00fbabsijwz6smm1s76vsjvahq5fp8wmjy1zhwxicmvacswcc5jp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-darwin-amd64.tar.gz"; @@ -321,100 +321,100 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-linux-arm64.tar.gz"; - sha256 = "0vq3qkryl68i6psxjm6aibav80hg2ndvfnvjyfd3cz4cmi3s8fd1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-linux-arm64.tar.gz"; + sha256 = "0qf2kg6rzihfw13kbx8gar78hmsfaalc5i9fyaijnnjw1r9jn4b6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-linux-arm64.tar.gz"; - sha256 = "1i8dn1byk0ykx5k1543najwlz09mpw6jlk4sl48jwjgh64595kb0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-linux-arm64.tar.gz"; + sha256 = "15335mk5f8k32m45divp9pbahygjz6hd7vkaf7wgqwqa4qnahwgz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-linux-arm64.tar.gz"; - sha256 = "15zz4nm8rj4jq3all8z7dvi2wnry861pv21c5pnsg32c93gl8swf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-linux-arm64.tar.gz"; + sha256 = "14cdzl3a7h5rm5h6rkji4qbsiyi1077i59wnqj2vl4qk971ba6n8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-linux-arm64.tar.gz"; - sha256 = "1a3kzpcjgz3019m9mnqb9j8yw0hrca2h5kz2zmzckr89fknlhk8b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-linux-arm64.tar.gz"; + sha256 = "18wcfx560jfsm7cimcgp36vpsbcvs9vbcm16a0db5wms8kc8synf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-linux-arm64.tar.gz"; - sha256 = "0p6n38la1chyq9g2d7p9gncf74pipxzq6gifsa36bki16m1wwy7d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1b76jgm6zmgzv1px26az1hpm4q3np6gl8yb9jgc7nk6bz739dvyi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-linux-arm64.tar.gz"; - sha256 = "1zc1d9ngv35hc7523p7prij5mriid11d259y3yd3jrdapiq8b9l1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-linux-arm64.tar.gz"; + sha256 = "09rm18fndgdna4b5jj300jk0l6bmapcizpnqdb3gcl02q6nd2jiv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-linux-arm64.tar.gz"; - sha256 = "0jlidmypn95nlnqim7p2i9fmwf7brdcsi5qwi6yihhcpsfya2ihw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-linux-arm64.tar.gz"; + sha256 = "1rgcsb0gbsr0r7rnyrzim92b54ig4vqzprcc7jcb6j5af4xmj2gs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-linux-arm64.tar.gz"; - sha256 = "1isvmdafq2gwq5hdm7lkbk84038vwjrssmqyf6b269x1c8p65g7n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-linux-arm64.tar.gz"; + sha256 = "0qnbgz640hjwnb73myzxgsmp9zl8lhkby3hmgf29g1ki893lnfj9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-linux-arm64.tar.gz"; - sha256 = "1n0xyyrsg4x6qbnwg8m0cs1wfhs749v1g32wm81pa13kg1k57ya3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-linux-arm64.tar.gz"; + sha256 = "1wzmwgazl60zsrhbv2x7153l4n8k5m93xmvchpcw058j2m92w259"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-linux-arm64.tar.gz"; - sha256 = "1sl88zb6gfcv5a28qf26zkm5wnxy914hwkf2z1jfzc33226dzcaa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-linux-arm64.tar.gz"; + sha256 = "13f1xmcdnjaz6g6pp0vh0hh1cvzba8jwp41fl1zpv36hngps53m1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-linux-arm64.tar.gz"; - sha256 = "0xisws2zz0fqdfjl28jnh51pwamlgbiz3x837p7w2r0q5cafa0xp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-linux-arm64.tar.gz"; + sha256 = "1v1s84fai552vd5cm6k0b3r59vgjkjd3yq3p2rl5i3bqgz7c76bj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-arm64.tar.gz"; sha256 = "09m1444wy8y6qjbp9pzki3gvi9mrs88cpc7001m8xnb0iyhjj0sx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-linux-arm64.tar.gz"; - sha256 = "08pkv0x3qkrdavq9khgbpr908y76767ixpc7m24lx0iy9xcxzmvs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-linux-arm64.tar.gz"; + sha256 = "05bq68jf75f4fm7qyl2z8xnjy9pyy3r4h8bak064vpygdjq5bhcy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-linux-arm64.tar.gz"; - sha256 = "0rvhilivm394a9kn5bzn4fyspab6cxrgmp73ab5pl8j10m3xgjl8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-linux-arm64.tar.gz"; + sha256 = "0sjhwrv21n52hf9id7ls18r3wcighvb0kbm87236vw9mysg8si2l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-linux-arm64.tar.gz"; - sha256 = "17dby8kfawi4jycfkhnl2w30i649dfl25j5sk2adm0nnwibygpdy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-linux-arm64.tar.gz"; + sha256 = "1cd92zc0b2b2jr7g95kaq7g97abvhfqwq2vyrxzcvrvs0vn4arfn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-linux-arm64.tar.gz"; - sha256 = "1arx0kq1ab13lsj5gnlhsvxqg13ixwd890i12xdbykhzl018dzr0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-linux-arm64.tar.gz"; + sha256 = "0i37kyifmpzz9fa4ymih6ppf94hbra8wfgha2pj4jbw43c6bv9cy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-linux-arm64.tar.gz"; - sha256 = "13f3z2f1bfzn3lx165gvlyg9dj9wbsqkwmz3vgzb2n6vfd2v7kz5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-linux-arm64.tar.gz"; + sha256 = "0132ahb2agpzrnhn17i0hrs7kch8g1x65p2h6npfnzl408zx1pry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-linux-arm64.tar.gz"; - sha256 = "0fmq2ll8ksb8b1v976inrcmrxfmp1k8710j6bi3ac3fjqlakm6y1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-linux-arm64.tar.gz"; + sha256 = "16i116riyz28y4jlznzw36c2fpkjnxv3bjiswfrlz9qhp4a6acpd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-linux-arm64.tar.gz"; - sha256 = "1f0ma10m2337yph79jf370w586w4iadqx6qiwcc57k5n2fz6qbfg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-linux-arm64.tar.gz"; + sha256 = "1pp1l1x4gpz9v87x92jzqb2wqxw756igwx78fphaivd9airp0fl4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-linux-arm64.tar.gz"; - sha256 = "0lcpxb3nf3sqzwp8h2s79hkk4a5s9rvxd36vsys45nbp5g14lvp3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-arm64.tar.gz"; + sha256 = "17bykmfj9kxw2c94wjxcfakd10apnc88axr3wx2pa2k5idxd3ih0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-linux-arm64.tar.gz"; - sha256 = "1lz5cnqdb3xmf9k7ds5whqqjwv0c5r4gpxjf8c8nnz1njkfx2sfw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-linux-arm64.tar.gz"; + sha256 = "0glgzm8w3qvy3zcswzrm0nmdd5n62934v8lbm3h3c2s5law08zrv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-linux-arm64.tar.gz"; - sha256 = "1j6hycdx8l9mwrvhx656pi7il6w1nknlk2p232nfi2qjlaz6ps0d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-linux-arm64.tar.gz"; + sha256 = "1d034j9v47f03kaya07vidksy67wxfhsl3ilgdmz1wffdkwg43wy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-linux-arm64.tar.gz"; - sha256 = "1in86cnz777fpjhg6j2z5s890580a3j23sqvwv4bbr1bcbs1wbks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-linux-arm64.tar.gz"; + sha256 = "16z5xb56zi975ad8l3wwz7lnc0f22waif6vnrbmd90jcjfx3gf5a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; @@ -429,24 +429,24 @@ sha256 = "1knr6yypkkxsays2ga6idia1bcc9y8n7dm0l5f3j7a56mhm7wmw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-linux-arm64.tar.gz"; - sha256 = "0hj4a0llq088xcfp85k6nn8ssffj51lvhqp05sg8x3kbg6n0dapy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-linux-arm64.tar.gz"; + sha256 = "1rhan3mjvs5kqzaklq42gb04jn1bph0bd64w2cwbaw6c34p7c1kp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-linux-arm64.tar.gz"; sha256 = "0x8mgh057ln80rvwxzdis2qd4knasvm2f3f5cniywnb4zz1xygv2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-linux-arm64.tar.gz"; - sha256 = "0pzckb7km63491p2dm4n4f6xhblqgwazgml6vm1gwm4ww0pw8qhi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-linux-arm64.tar.gz"; + sha256 = "12kl7dazjmz2sn15yd1fin5f7d8aj0qm9f5a9vp52qjadpzsmvy0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-linux-arm64.tar.gz"; - sha256 = "0k65mif1rdyfz71ir9xhvqkzwpsk1wjsf7z8dhdd0s008dqkd43w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-linux-arm64.tar.gz"; + sha256 = "0lw95n1s4ac0ys764saj16lfq2hlfh98067hi2qm6kxjwiplmzh6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-linux-arm64.tar.gz"; - sha256 = "0cshgck8fz5qq60bc04jd83756rnk1skwm1fvjc78vb38fyrgy84"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-linux-arm64.tar.gz"; + sha256 = "03aviplnf7hcj4hy3y308hw8zlkdqgvfx0587xzmd7dcw0q5br9s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-linux-arm64.tar.gz"; @@ -457,16 +457,16 @@ sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-linux-arm64.tar.gz"; - sha256 = "1p8xjjsfy9hkww6p66jzr5q5nn07ng25y6yjzb3xvcfsrbkzylsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-linux-arm64.tar.gz"; + sha256 = "15a93vb3b3nlk7fyl9qh2jayhv48fk0hja07nvjkz23xfl3zpxdr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-arm64.tar.gz"; sha256 = "1psibvdvnqmcjyd4knwxqq97k72da7qgrm2g08n41bvjdv10j6hh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-linux-arm64.tar.gz"; - sha256 = "129fzjlp26pqb5xb4gqqyy62qk2hxrfhdmn5z5wib4vqhpjvl4nk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-linux-arm64.tar.gz"; + sha256 = "1xsmlza394wc38pyi4zzhfn7mvn4znvv00k9dxm8w3bxnym5gpbl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-linux-arm64.tar.gz"; @@ -479,100 +479,100 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-darwin-arm64.tar.gz"; - sha256 = "1b4f102cbywxnhx5p4v15xky3p437ws54rmk7xdzn4qs675cndss"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-darwin-arm64.tar.gz"; + sha256 = "0awvmrvs5ggj7klqbkgbmmxb20snrnk306003l34q3nscqqxd8zm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-darwin-arm64.tar.gz"; - sha256 = "0jcina7ziy381d815s25v18k53nwf1bb5rkiq36d39pqjy8h7cn1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-darwin-arm64.tar.gz"; + sha256 = "03icn9ab7lsdh4kr2zwlbz6s2mp23zscb8igy75iz9scip49ahis"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "08fzl53xbd3vamr7xhp84l7c8qm2ashyg2vs97rzijblb7bp04c5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "1lgqfvkxymfcfjzn9c94cigz34rc9fiqcdmg125dndjz5nnxk3zl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-darwin-arm64.tar.gz"; - sha256 = "0vg1k0qz98p3p1k5c57p6fbkmajpi0mdynwilhz9gwbrvx3vd9xh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-darwin-arm64.tar.gz"; + sha256 = "1ry88fr8ix4rn73xk6hv4si7khkdf7di98b9ncymna9520z2jxgv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-darwin-arm64.tar.gz"; - sha256 = "1p56v8028gcsaxwry9ig31dfr9dxmnbd8jsggjjbz0d74jcqdcqh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "07mvh4ffc8zqx037fdk4n4yd4b6zmd873g1dfb8kgf875vs5wdfh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-darwin-arm64.tar.gz"; - sha256 = "1qfv67sb4pambxfsk58wxnbx1fl1xxksw2k05vyyss9a3xzf9mi7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-darwin-arm64.tar.gz"; + sha256 = "0260gpq212dj3c782bdx4fn2c9vk1kv0j42sq037k4ih430wqxwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-darwin-arm64.tar.gz"; - sha256 = "1wdqazsx7496y0xwphnnyi8zbpivjgmc8xpb76ajz1dar5vx0m7r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-darwin-arm64.tar.gz"; + sha256 = "06cm6va9bbkcm1sznlkjc95b1n20bsf3yvw1pysh3pwbs1qwd8v3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-darwin-arm64.tar.gz"; - sha256 = "1c6l6c429az92v97dbnlbk8046hv39j6whyvklw32pqa8ab9jknd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-darwin-arm64.tar.gz"; + sha256 = "18h0pzn7q5lm1p8i3yp2yvqyq3qhn2ipzsjj5sl383dnwbsp5z1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-darwin-arm64.tar.gz"; - sha256 = "0bwnirhdhdsa2q68295ab1ny8jvqmykgf1sdwfnlc0gnz34nxyd2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-darwin-arm64.tar.gz"; + sha256 = "1lrnjw7jd5nxcvkhmymkdyg180i93jfy3snnh0a950m4dbmk5ap3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-darwin-arm64.tar.gz"; - sha256 = "0i6gjnfish862fiyay7qq94l1k0cvcpvbgp73kadlraw8rcjnli5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-darwin-arm64.tar.gz"; + sha256 = "17nrxc6s9f56m7mwdaa06n4dqq2bldpss6ahqy4a79ha2qvhsxin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-darwin-arm64.tar.gz"; - sha256 = "1j4fpy3j4g9sr619iwkwhb9037d976wdnbfpqy9fig1dayz4q6mn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-darwin-arm64.tar.gz"; + sha256 = "10glgipfjm5ph6g4c48cggymaf4mzw8vm2f7xw62fxly8mqy2s24"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-arm64.tar.gz"; sha256 = "0301sm5d28yjw15k214rskq1w19a5b5l218y2qfzvv89z5qgh84r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-darwin-arm64.tar.gz"; - sha256 = "1xcq4qb2xj24wkrsn1qz61k94m8kqf1wiwc1vlphjim009v7xb78"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-darwin-arm64.tar.gz"; + sha256 = "1f8f2ncbdfxb6spgpzwfypj9vw9r3hcjwdgwg26n6zsfsd5jzfzx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-darwin-arm64.tar.gz"; - sha256 = "0bp22i99vv8r9wxf453kg5h9q4il93hgh8v9q868zg6hnfaig79b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-darwin-arm64.tar.gz"; + sha256 = "00fp3kns2558kwwy0jmlvg3fzhyp629nszgz2gbkdyasbh6a8qh9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-darwin-arm64.tar.gz"; - sha256 = "0x24l3y6jq7j240hsj2n9pqpnyjq0141n6c7i662nxx4dxzf040w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "1i4skyqjr9xd4jqsslfckjsj2ld896a0vwhaj2rxrvd7ljrjvgz6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-darwin-arm64.tar.gz"; - sha256 = "11vcj5zxjfc1jwxlpam0w839dig5z19d6swcy100yjp00wqp5k50"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-darwin-arm64.tar.gz"; + sha256 = "1mg3pp3zl2jcc8k102a4zjr66x8379k5bdvixf1clgg9kb56i9bk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-darwin-arm64.tar.gz"; - sha256 = "0qdxxw3zaxrqq2wzbav9614w2x2w6rrar9k4lav0rmfizvvbg2cd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-darwin-arm64.tar.gz"; + sha256 = "0kjanryv6yfg59hiidj3x9cxrpdcnbsnxmwqv8qqk0ls7qs6smk2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-darwin-arm64.tar.gz"; - sha256 = "11198hv8lm05xz4yvlz495palp1h4zn3x0zvml4clhn2ip03mmp2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-darwin-arm64.tar.gz"; + sha256 = "0pny6zhbx3r17vwrb0yw6qkjfa5m2nr3g4hwl2p3cwxgn9bfdwpy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-darwin-arm64.tar.gz"; - sha256 = "10ilfmllagp8008d5sdkdyd0ajr018n03lxi63x0bzc8xxfkp1an"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-darwin-arm64.tar.gz"; + sha256 = "02m6rfbyl4ysd470zmadc9gqrxbxpkbfd609zk0i4li9i36ch85f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-darwin-arm64.tar.gz"; - sha256 = "03yibn1j9l7dxrras4ihqagj9nws20dppmg5j40h1kwdjyaa4krd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-arm64.tar.gz"; + sha256 = "0wcxrcpijn6jzz0l5azfqvh31xzg5q5bvk39iifczimdvw37xnva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-darwin-arm64.tar.gz"; - sha256 = "0im49ll5azdbqfvjwbkc0pcq071zjb0n6af2qk2bkb2aymcgkv57"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-darwin-arm64.tar.gz"; + sha256 = "0aic4acxf50x5ybfdx9rravsyjx0wvnzabqy5lgicxwd6hkc84yi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-darwin-arm64.tar.gz"; - sha256 = "0w75mc0ffmgy22pl6wqfj9vbm1zz5ihybiqk942wnaq0swjc7zaz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-darwin-arm64.tar.gz"; + sha256 = "12nx3cn38j9agaw4qqp44f5w16954zhlxj3cjn3kna9phc7lza6a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "1v920f9cnz8f1s0md48db6qq8xgqif2w4vxcq1czfr5i1c1hhv0w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-darwin-arm64.tar.gz"; + sha256 = "1dcwi9lnbx7ikj58fzznvz8c7lwnbfcdhw0mlnbldxkxfzba32sp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; @@ -587,24 +587,24 @@ sha256 = "0iys3f21qfdx1gilba9xds5wv5d5xcw6qsd9c2662i42ccgggcjn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "1fhll8bgamlv4kljngydmnhbc90bz3figg10qy3qa9kgqkrxm041"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-darwin-arm64.tar.gz"; + sha256 = "1cjrj1vl9ljx32j7zss74kqg367zcz6nmisz0am5i040kiqgb7na"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-darwin-arm64.tar.gz"; sha256 = "1w7g9gc01fpsa41csp5sv6q2w9g4i7gn5b1lnm0dal16169dkpy6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-darwin-arm64.tar.gz"; - sha256 = "160r0a6iwpp1chk0sshj3ds2w1sv5wvrn2gmkgbvvg5mg4lymwm0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-darwin-arm64.tar.gz"; + sha256 = "1r9ffydqvm9ldybq134h3rcik8c5lh0i8rz01vx7wp03flrx92iw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-darwin-arm64.tar.gz"; - sha256 = "0xamhaxrwzi74vxpp41avb35qzq3mhwybjgs7sq0p208j5mrbawl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-darwin-arm64.tar.gz"; + sha256 = "1cbzsf1hn0qqxzs7zh8wawnlfc95qi36ba8wk1jzy6m357wlzswh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-darwin-arm64.tar.gz"; - sha256 = "17pv2i810z16l2mw6n5g0nd2c7ahx9pi5zrvjkw0zlj5zqn0gg6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "16g2yjlhg3cja48qp70mmrms70n7mpz917izzmrv1ymazdjzsspm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-darwin-arm64.tar.gz"; @@ -615,16 +615,16 @@ sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-darwin-arm64.tar.gz"; - sha256 = "06n5hbwa69xf30hhynd87r2n80lxnzshffvrdn3i790dbvl034z2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-darwin-arm64.tar.gz"; + sha256 = "0l5rzcdx9v6h4qb8pk631cb68c2m3rcpia1aq64psb91g8lhrwa3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-arm64.tar.gz"; sha256 = "1lnbsfcv1vrgc2hzmqwydxp9j6w9cmgpkpm83hmzz2ryy2vn6g07"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "12r3dbhqidlibzcl14al8rkwlrdxvaikh9cla8wd7hjpjmd4d5yj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-darwin-arm64.tar.gz"; + sha256 = "1r25pimq5r8f2r68prb14wk0ppb6ikf9z61lj6x8h5ym1advgirk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 0f2fa51e374..1f03755ef91 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "syft"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index a405f10671c..d1a0d8cf416 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , xorg , xkeyboard_config , zlib diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 738680a552a..331d977147b 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, acl }: +{ lib, stdenv, fetchurl, autoreconfHook, acl, libintl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; - buildInputs = lib.optional stdenv.isLinux acl; + # Add libintl on Darwin specifically as it fails to link (or skip) + # NLS on it's own: + # "_libintl_textdomain", referenced from: + # _main in tar.o + # ld: symbol(s) not found for architecture x86_64 + buildInputs = lib.optional stdenv.isLinux acl ++ lib.optional stdenv.isDarwin libintl; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 5eaaa9c873e..02460f61d93 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , python3Packages , ffmpeg , makeWrapper diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix index f771fd47a75..bed9c415c83 100644 --- a/pkgs/tools/audio/headset-charge-indicator/default.nix +++ b/pkgs/tools/audio/headset-charge-indicator/default.nix @@ -14,13 +14,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eaAbqeFY+B3CcKJywC3vaRsWZNQENTbALc7L7uW0W6U="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ (python3.withPackages (ps: with ps; [ pygobject3 ])) headsetcontrol gtk3 - gobject-introspection libayatana-appindicator ]; diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix index fa01756f898..f135cccbc6c 100644 --- a/pkgs/tools/audio/isrcsubmit/default.nix +++ b/pkgs/tools/audio/isrcsubmit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "isrcsubmit"; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 777a7535a10..7ea5cf622b5 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -7,7 +7,6 @@ , cmake , pkg-config , fetchFromGitHub -, git , python3 , Accelerate , _experimental-update-script-combinators @@ -88,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateOpenfst ]; - }; + }; meta = with lib; { description = "Speech Recognition Toolkit"; diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix index 841704427c2..ec55367474f 100644 --- a/pkgs/tools/audio/midimonster/default.nix +++ b/pkgs/tools/audio/midimonster/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchurl -, zlib , fetchFromGitHub , gnumake , gcc @@ -15,7 +13,7 @@ , libevdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "midimonster"; version = "0.6.0"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { owner = "cbdevnet"; rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0"; sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp"; -}; + }; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index 66f6d1880a6..03b632ae7e0 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, systemd , file , iniparser , ffmpeg @@ -33,9 +32,9 @@ stdenv.mkDerivation rec { ffmpeg libmpdclient discount - ]; + ]; - installPhase = '' + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { ''; postPatch = '' - substituteInPlace systemd/mpd-notification.service --replace /usr $out - ''; + substituteInPlace systemd/mpd-notification.service --replace /usr $out + ''; - meta = with lib; { + meta = with lib; { description = "Notifications for mpd"; homepage = "https://github.com/eworm-de/mpd-notification"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 5410dced90a..6b286321382 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -15,14 +15,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.15.6"; + version = "0.16.0"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-ZEmj0D+q2/UpDTEZDPb13BKiNRUcZsJmJRWOCq+8CUk="; + hash = "sha256-2JZyINyzy4X1DTp4ZsMLY/rCsH4JdQ8bF/3hoqtvNTU="; }; postPatch = let diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index dfde510441c..76c4c89bceb 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.23"; + version = "0.3.24"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-na9k26+GDdASZ37n0QtFuRDMtq338QOlXTf0X4raOJI="; + sha256 = "sha256-EY5SL8/KITEoOWq2owxQjnemYNsjYqJLLlRVFdYPoVA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index ac64242fe64..63845045c06 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -5,7 +5,6 @@ , cinnamon , gnome , gobject-introspection -, intltool , libnotify , pavucontrol , python3Packages diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 5b887222c51..cc4f15d1bea 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 +, obex_data_server, xdg-utils, dnsmasq, dhcp, iproute2 , gnome, librsvg, wrapGAppsHook, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 7a86be1fa1d..7904e8d5b5d 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bluetuith"; diff --git a/pkgs/tools/bluetooth/nrfconnect/default.nix b/pkgs/tools/bluetooth/nrfconnect/default.nix index 8a89f5fc840..07dc7303a06 100644 --- a/pkgs/tools/bluetooth/nrfconnect/default.nix +++ b/pkgs/tools/bluetooth/nrfconnect/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , appimageTools }: diff --git a/pkgs/tools/cd-dvd/ventoy/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix index bc29040d89d..1983018788e 100644 --- a/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/pkgs/tools/cd-dvd/ventoy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoPatchelfHook , bash , copyDesktopItems diff --git a/pkgs/tools/compression/keka/default.nix b/pkgs/tools/compression/keka/default.nix new file mode 100644 index 00000000000..71e979fa0c2 --- /dev/null +++ b/pkgs/tools/compression/keka/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +, makeWrapper +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "keka"; + version = "1.3.2"; + + src = fetchurl { + url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; + sha256 = "0id8j639kba5yc0z34lgvadzgv9z9s2573nn6dx9m6gd8qpnk2x7"; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications $out/bin + unzip -d $out/Applications $src + makeWrapper $out/Applications/Keka.app/Contents/MacOS/Keka $out/bin/keka \ + --add-flags "--cli" + + runHook postInstall + ''; + + meta = with lib; { + description = "macOS file archiver"; + homepage = "https://www.keka.io"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 2d3890484e7..d63140b1476 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,6 +1,7 @@ { cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv +, config , enableCfp ? true -, enableCuda ? false +, enableCuda ? config.cudaSupport , enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 753368b70b9..2c844cffc21 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "zopfli"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 3a51bdce190..791dda4f11e 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file -, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 5710d80c2cc..fd1166e1a30 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -75,8 +75,8 @@ in substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'').overrideAttrs (old: { +'').overrideAttrs { passthru.tests = { smoke-test = nixosTests.bees; }; -}) +} diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 3efd4c69c51..a2efc2e82c5 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-qfJhmdWBeBb1sKjw9jdj8/sBQ6IDiKkpt0LcrVvyfCQ="; + sha256 = "sha256-S+MAFXYCcNCBZCzAAjqL/ufLZXoqoFVkTmpW1oaVuW4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 2437fd358a7..1b0c9c98633 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -107,7 +107,7 @@ let optZfs = shouldUsePkg zfs; # Downgrade rocksdb, 7.10 breaks ceph - rocksdb' = rocksdb.overrideAttrs (oldAttrs: { + rocksdb' = rocksdb.overrideAttrs { version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; @@ -115,7 +115,7 @@ let rev = "refs/tags/v7.9.2"; hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; - }); + }; hasRadosgw = optExpat != null && optCurl != null && optLibedit != null; @@ -165,7 +165,7 @@ let # Watch out for python <> boost compatibility python = python310.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { version = "1.4.46"; src = fetchPypi { pname = "SQLAlchemy"; @@ -176,7 +176,7 @@ let "test/aaa_profiling" "test/ext/mypy" ]; - }); + }; }; }; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index fba54761233..588dcb320aa 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-7luTCDjrquG8aBZ841VPwV9/ea8faHGLQtmRahqGTss="; + hash = "sha256-OkJhLg+YzS3kDhlpUQe9A+OiVBPG/iKs6OU7aKFJ5wY="; }; postPatch = '' diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 1efef2d9b53..3d3c1b54db8 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoreconfHook , neon , procps diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index 9c38852e4e9..efdb9f3dc1d 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }: let - btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: { + btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; @@ -9,7 +9,7 @@ let sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; }) ]; - }); + }; py3 = python3.withPackages (ps: with ps; [ prettytable numpy diff --git a/pkgs/tools/filesystems/disk-inventory-x/default.nix b/pkgs/tools/filesystems/disk-inventory-x/default.nix new file mode 100644 index 00000000000..008781d4cd4 --- /dev/null +++ b/pkgs/tools/filesystems/disk-inventory-x/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "disk-inventory-x"; + version = "1.3"; + + src = fetchurl { + url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg"; + sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq"; + }; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Disk usage utility for Mac OS X"; + homepage = "https://www.derlien.com"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = [ "x86_64-darwin" ]; + }; +}) diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/tools/filesystems/dupe-krill/default.nix index b28aaadca90..d825c1b0fb0 100644 --- a/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/pkgs/tools/filesystems/dupe-krill/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, runCommand }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "dupe-krill"; diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 1ffe03601df..e5804f37852 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -7,9 +7,8 @@ , boost , cmake , double-conversion -, fmt_8 +, fmt , fuse3 -, gflags , glog , gtest , jemalloc @@ -21,30 +20,27 @@ , pkg-config , ronn , xxHash +, utf8cpp , zstd }: stdenv.mkDerivation rec { pname = "dwarfs"; - version = "0.6.2"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-fA/3AooDndqYiK215cu/zTqCqeccHnwIX2CfJ9sC+Fc="; + hash = "sha256-DcPRrATI2cpLZWAL+sSCoXvJ1R0O3yHqhlJW1aEpDpA="; }; - patches = with lib.versions; [ - (substituteAll { + patches = [ + (with lib.versions; substituteAll { src = ./version_info.patch; - gitRev = "v${version}"; - gitDesc = "v${version}"; - gitBranch = "v${version}"; - gitId = "v${version}"; # displayed as version number - + versionFull = version; # displayed as version number (with v prepended) versionMajor = major version; versionMinor = minor version; versionPatch = patch version; @@ -55,14 +51,11 @@ stdenv.mkDerivation rec { "-DPREFER_SYSTEM_ZSTD=ON" "-DPREFER_SYSTEM_XXHASH=ON" "-DPREFER_SYSTEM_GTEST=ON" + "-DPREFER_SYSTEM_LIBFMT=ON" # may be added under an option in the future # "-DWITH_LEGACY_FUSE=ON" "-DWITH_TESTS=ON" - - # temporary hack until folly builds work on aarch64, - # see https://github.com/facebook/folly/issues/1880 - "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" ]; nativeBuildInputs = [ @@ -75,12 +68,13 @@ stdenv.mkDerivation rec { buildInputs = [ # dwarfs boost - fmt_8 + fmt fuse3 jemalloc libarchive lz4 xxHash + utf8cpp zstd # folly @@ -93,9 +87,9 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ gtest ]; - # this fails inside of the sandbox due to missing access + # these fail inside of the sandbox due to missing access # to the FUSE device - GTEST_FILTER = "-tools.everything"; + GTEST_FILTER = "-dwarfs/tools_test.end_to_end/*:dwarfs/tools_test.mutating_ops/*"; meta = with lib; { description = "A fast high compression read-only file system"; diff --git a/pkgs/tools/filesystems/dwarfs/version_info.patch b/pkgs/tools/filesystems/dwarfs/version_info.patch index 59936302ace..8d62bd8d229 100644 --- a/pkgs/tools/filesystems/dwarfs/version_info.patch +++ b/pkgs/tools/filesystems/dwarfs/version_info.patch @@ -1,6 +1,24 @@ +diff --git a/cmake/package_version.cmake b/cmake/package_version.cmake +new file mode 100644 +index 0000000..d4fdb9c +--- /dev/null ++++ b/cmake/package_version.cmake +@@ -0,0 +1,12 @@ ++# autogenerated code, do not modify ++ ++set(PRJ_GIT_REV "v@versionFull@") ++set(PRJ_GIT_DESC "v@versionFull@") ++set(PRJ_GIT_BRANCH "HEAD") ++set(PRJ_GIT_ID "v@versionFull@") ++set(PRJ_GIT_RELEASE_TAG "v@versionFull@") ++set(PRJ_VERSION_FULL "@versionFull@") ++set(PRJ_VERSION_SHORT "@versionFull@") ++set(PRJ_VERSION_MAJOR "@versionMajor@") ++set(PRJ_VERSION_MINOR "@versionMinor@") ++set(PRJ_VERSION_PATCH "@versionPatch@") diff --git a/include/dwarfs/version.h b/include/dwarfs/version.h -new file mode 100755 -index 0000000..9b12c59 +new file mode 100644 +index 0000000..54cf86a --- /dev/null +++ b/include/dwarfs/version.h @@ -0,0 +1,16 @@ @@ -21,8 +39,8 @@ index 0000000..9b12c59 + +} // namespace dwarfs diff --git a/src/dwarfs/version.cpp b/src/dwarfs/version.cpp -new file mode 100755 -index 0000000..3af0215 +new file mode 100644 +index 0000000..5759120 --- /dev/null +++ b/src/dwarfs/version.cpp @@ -0,0 +1,12 @@ @@ -32,9 +50,9 @@ index 0000000..3af0215 + +namespace dwarfs { + -+char const* PRJ_GIT_REV = "@gitRev@"; -+char const* PRJ_GIT_DESC = "@gitDesc@"; -+char const* PRJ_GIT_BRANCH = "@gitBranch@"; -+char const* PRJ_GIT_ID = "@gitId@"; ++char const* PRJ_GIT_REV = "@versionFull@"; ++char const* PRJ_GIT_DESC = "v@versionFull@"; ++char const* PRJ_GIT_BRANCH = "HEAD"; ++char const* PRJ_GIT_ID = "v@versionFull@"; + +} // namespace dwarfs diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 4eb488b2d02..ef4a46868ca 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, testers, Security, garage, nixosTests }: +, cacert, Security, garage, nixosTests }: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 23446ce998d..a1f424915f3 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , fuse diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index 53841f68420..207fcfc9c74 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -16,7 +16,7 @@ buildGoModule { sha256 = "sha256-6yVMNSwwPZlADXuPBDRlgoz4Stuz2pgv6r6+y2/C8XY="; }; - vendorSha256 = "sha256-2N8MshBo9+2q8K00eTW5So6d8ZNRzOfQkEKmxR428gI="; + vendorSha256 = "sha256-shFld293pdmVcnu3p0NoBmPGLJddZd4O/gJ8klgdlQ8="; subPackages = [ "." ]; diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index aa2260cb374..7f7a9f54fd8 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , python3 diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix index c0b74d9cf1b..d4008b2fa3c 100644 --- a/pkgs/tools/filesystems/mkspiffs/presets.nix +++ b/pkgs/tools/filesystems/mkspiffs/presets.nix @@ -4,10 +4,10 @@ lib.mapAttrs ( name: { CPPFLAGS }: - mkspiffs.overrideAttrs (drv: { + mkspiffs.overrideAttrs { inherit CPPFLAGS; BUILD_CONFIG_NAME = "-${name}"; - }) + } ) { arduino-esp8266.CPPFLAGS = [ "-DSPIFFS_USE_MAGIC_LENGTH=0" diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix new file mode 100644 index 00000000000..678abe4892c --- /dev/null +++ b/pkgs/tools/filesystems/mount-zip/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, fuse, boost, gcc, icu, libzip, pandoc +, pkg-config }: + +stdenv.mkDerivation (finalAttrs: { + pname = "mount-zip"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "google"; + repo = "mount-zip"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+slN5eedSddYKgiNLq4KZ5BXwvGQw9859sVfkcIBYeo="; + }; + + nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; + buildInputs = [ fuse libzip ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "FUSE file system for ZIP archives"; + homepage = "https://github.com/google/mount-zip"; + longDescription = '' + mount-zip is a tool allowing to open, explore and extract ZIP archives. + + This project is a fork of fuse-zip. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ arti5an ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index a4e1b6d62c4..d4ef2154d81 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,16 +1,13 @@ { lib , stdenv , fetchurl -, fetchpatch , acl , autoreconfHook , avahi , db -, ed , libevent , libgcrypt , libiconv -, libtirpc , openssl , pam , perl diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index fbb1532f3e6..5f3b5e534ca 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libuuid, libselinux , e2fsprogs }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/tools/filesystems/sdat2img/default.nix index 44e884201d4..4176eabad40 100644 --- a/pkgs/tools/filesystems/sdat2img/default.nix +++ b/pkgs/tools/filesystems/sdat2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "sdat2img"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index c52b83ceb1a..ae658330b28 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , help2man , lz4 , lzo diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 4ac3d777bc5..b41d5b2c699 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-CvXn5b1kEZ2gYqfKSFRNzqkyOAcfcI1/3etRJTKwqog="; + sha256 = "sha256-+GhYeQ27uwg9JOv1qbf1+UbMd+vPXJ05nsXZD9OakzI="; }; sourceRoot = "source/cmd/tar2ext4"; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 5e325591e6e..623cef88447 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/tools/filesystems/wipefreespace/default.nix index 885d64f7c41..03adc070c0e 100644 --- a/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/pkgs/tools/filesystems/wipefreespace/default.nix @@ -1,5 +1,4 @@ { stdenv -, pkgs , lib , fetchurl , e2fsprogs diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 7f14e1b1dc8..ee9177e37c2 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-7Jh8nwvLLbKZG/+4DTUxULOJw6K3m2gwQR9wQq32mQw="; + hash = "sha256-wxhoQYv79Jo6nEf8cM3/3p2W9P8AUb0EoIgeZlRkgQQ="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix index afafbca58ba..601baabd87e 100644 --- a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix +++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix @@ -1,8 +1,7 @@ -{ rustPlatform +{ lib +, rustPlatform , cloud-utils , fetchFromGitHub -, lib -, llvmPackages , pkg-config , util-linux , zfs diff --git a/pkgs/tools/games/ps3-disc-dumper/default.nix b/pkgs/tools/games/ps3-disc-dumper/default.nix index 577be973848..6cf54c9a8f8 100644 --- a/pkgs/tools/games/ps3-disc-dumper/default.nix +++ b/pkgs/tools/games/ps3-disc-dumper/default.nix @@ -1,6 +1,5 @@ { lib , buildDotnetModule -, dotnetCorePackages , fetchFromGitHub , zlib , openssl diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 6a41cd6b52d..828d0e7ce46 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, makeWrapper, buildMaven, maven, jdk }: +{ lib, fetchFromGitHub, makeWrapper, maven, jdk }: let mavenWithJdk = maven.override { inherit jdk; }; in diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/tools/games/steamtinkerlaunch/default.nix index ea64c7208bc..4f37109f543 100644 --- a/pkgs/tools/games/steamtinkerlaunch/default.nix +++ b/pkgs/tools/games/steamtinkerlaunch/default.nix @@ -3,7 +3,6 @@ , git , gnugrep , fetchFromGitHub -, installShellFiles , lib , makeWrapper , stdenv diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 795378d370c..136c46d69cb 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub , autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv diff --git a/pkgs/tools/graphics/didder/default.nix b/pkgs/tools/graphics/didder/default.nix index e5acb60586e..e42a89c72d6 100644 --- a/pkgs/tools/graphics/didder/default.nix +++ b/pkgs/tools/graphics/didder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pandoc }: +{ lib, buildGoModule, fetchFromGitHub, pandoc }: buildGoModule rec { pname = "didder"; diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix new file mode 100644 index 00000000000..eafed87ba1f --- /dev/null +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: +rustPlatform.buildRustPackage rec { + pname = "dnglab"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "dnglab"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4uTpCBzBBkcpVBVZMOBD6f9ut71OuUNQ5+AkaQcU86M="; + }; + + cargoSha256 = "sha256-WvXQNDYvR6s4M2Hlpqwq1/wFQYW2QU/ngQimKOFkhOQ="; + + postInstall = '' + rm $out/bin/benchmark $out/bin/identify + ''; + + meta = with lib; { + description = "Camera RAW to DNG file format converter"; + homepage = "https://github.com/dnglab/dnglab"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index bfcaa7154c0..cbfdeb22fbc 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -8,7 +8,6 @@ , wayland-scanner , libjpeg , libpng -, xorg , libX11 , libGL , libdrm diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index ab6a5110db4..1b7fd162dba 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , autoreconfHook , pkg-config , cairo diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix deleted file mode 100644 index adbe371dbb8..00000000000 --- a/pkgs/tools/graphics/ldgallery/compiler/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -# generated with cabal2nix by ./generate.sh -{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist -, directory, fetchgit, filepath, Glob, hpack, lib, parallel-io -, process, safe, text, time, yaml -}: -mkDerivation { - pname = "ldgallery-compiler"; - version = "2.1"; - src = fetchgit { - url = "https://github.com/pacien/ldgallery.git"; - sha256 = "184zysh5qwkbki8mn0br87h65yi5j39qwnmhz05z3ir9wfiniq4b"; - rev = "11bbbae2850b9c45da697a8ed9626495a50a38c0"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/compiler; echo source root reset to $sourceRoot"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base cmdargs containers data-ordlist directory filepath Glob - parallel-io process safe text time yaml - ]; - libraryToolDepends = [ hpack ]; - executableHaskellDepends = [ - aeson base cmdargs containers data-ordlist directory filepath Glob - parallel-io process safe text time yaml - ]; - testHaskellDepends = [ - aeson base cmdargs containers data-ordlist directory filepath Glob - parallel-io process safe text time yaml - ]; - prePatch = "hpack"; - homepage = "https://ldgallery.pacien.org"; - description = "A static generator which turns a collection of tagged pictures into a searchable web gallery"; - license = lib.licenses.agpl3Only; - mainProgram = "ldgallery"; - maintainers = [ lib.maintainers.pacien ]; - - # Does not compile with ghc-9.2 - hydraPlatforms = lib.platforms.none; - broken = true; -} diff --git a/pkgs/tools/graphics/ldgallery/compiler/generate.sh b/pkgs/tools/graphics/ldgallery/compiler/generate.sh deleted file mode 100755 index 355206cb0ff..00000000000 --- a/pkgs/tools/graphics/ldgallery/compiler/generate.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the nix file for the ldgallery-compiler package." - echo "Usage: $0 <git release tag>" - exit 1 -fi - -echo "# generated with cabal2nix by ./generate.sh" > default.nix - -cabal2nix \ - --maintainer pacien \ - --subpath compiler \ - --revision $1 \ - "https://github.com/pacien/ldgallery.git" \ - >> default.nix diff --git a/pkgs/tools/graphics/ldgallery/default.nix b/pkgs/tools/graphics/ldgallery/default.nix deleted file mode 100644 index 1b620656ce5..00000000000 --- a/pkgs/tools/graphics/ldgallery/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }: - -with lib; -with haskell.lib.compose; - -let - ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; }; - inherit (haskellPackages) ldgallery-compiler; - -in - -# making sure that the versions of the compiler and viewer parts are in sync -assert ldgallery-compiler.version == versions.majorMinor ldgallery-viewer.version; - -justStaticExecutables (overrideCabal (oldAttrs: { - pname = "ldgallery"; # bundled viewer + compiler - - buildTools = (oldAttrs.buildTools or []) ++ [ makeWrapper pandoc ]; - - prePatch = '' - # add viewer dist to data - ln -s "${ldgallery-viewer}/share/ldgallery/viewer" "data/" - - ${oldAttrs.prePatch or ""} - ''; - - postInstall = '' - ${oldAttrs.postInstall or ""} - - # wrapper for runtime dependencies registration - wrapProgram "$out/bin/ldgallery" \ - --prefix PATH : ${lib.makeBinPath [ imagemagick ]} - - # bash completion - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/ldgallery" \ - --help=bash \ - > "$out/share/bash-completion/completions/ldgallery" - - # man pages - mkdir -p $out/share/man/man{1,7} - ln -s ${ldgallery-viewer}/share/man/man7/* "$out/share/man/man7/" - pandoc --standalone --to man \ - "../ldgallery-quickstart.7.md" \ - --output "$out/share/man/man7/ldgallery-quickstart.7" - pandoc --standalone --to man \ - "ldgallery.1.md" \ - --output "$out/share/man/man1/ldgallery.1" - ''; - - # other package metadata (maintainer, description, license, ...) - # are inherited from the compiler package -}) ldgallery-compiler) diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix deleted file mode 100644 index bbaed09684e..00000000000 --- a/pkgs/tools/graphics/ldgallery/viewer/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkgs, pandoc, CoreServices }: - -let - # Note for maintainers: - # * keep version in sync with the ldgallery compiler - # * regenerate node-*.nix with `./generate.sh <git release tag>` - sourcePkg = fetchFromGitHub { - owner = "pacien"; - repo = "ldgallery"; - rev = "v2.1"; - sha256 = "sha256-i+Boo+Mpx/EL+LBajtOQJfpi4EF5AVtRnGtyXKD2n6A="; - }; - - nodePackages = import ./node-composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; - - nodePkg = nodePackages.package.override { - src = "${sourcePkg}/viewer"; - postInstall = "npm run build"; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - }; - -in - -# making sure that the source and the node package are in sync -assert lib.versions.majorMinor nodePkg.version == lib.removePrefix "v" sourcePkg.rev; - -stdenv.mkDerivation { - pname = nodePkg.packageName; - version = nodePkg.version; - src = nodePkg; - - buildInputs = [ pandoc ]; - - installPhase = '' - mkdir -p "$out/share/ldgallery" - cp -rp "lib/node_modules/ldgallery-viewer/dist" \ - "$out/share/ldgallery/viewer/" - cp -rp "${sourcePkg}/example" \ - "$out/share/ldgallery/viewer/" - - mkdir -p "$out/share/man/man7" - pandoc --standalone --to man \ - "lib/node_modules/ldgallery-viewer/ldgallery-viewer.7.md" \ - --output "$out/share/man/man7/ldgallery-viewer.7" - ''; -} diff --git a/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/pkgs/tools/graphics/ldgallery/viewer/generate.sh deleted file mode 100755 index 1f9b4f14526..00000000000 --- a/pkgs/tools/graphics/ldgallery/viewer/generate.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix wget - -# TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once -# * support for npm projects in sub-directories is added to node2nix: -# https://github.com/svanderburg/node2nix/issues/177 -# * we find a way to enable development dependencies for some of the packages - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the node composition and package nix files for the ldgallery-viewer package." - echo "Usage: $0 <git release tag>" - exit 1 -fi - -wget https://github.com/pacien/ldgallery/raw/$1/viewer/package.json - -# Development dependencies are required for this Vue application to build -node2nix \ - --node-env ../../../../development/node-packages/node-env.nix \ - --development \ - --input ./package.json \ - --output node-packages.nix \ - --composition node-composition.nix \ - --nodejs-14 \ - --no-copy-node-env - -rm package.json diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix deleted file mode 100644 index a621dc22dee..00000000000 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.0. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: - -let - nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix deleted file mode 100644 index d3191bd1e17..00000000000 --- a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix +++ /dev/null @@ -1,9570 +0,0 @@ -# This file has been generated by node2nix 1.11.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@achrinza/node-ipc-9.2.5" = { - name = "_at_achrinza_slash_node-ipc"; - packageName = "@achrinza/node-ipc"; - version = "9.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz"; - sha512 = "kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ=="; - }; - }; - "@ampproject/remapping-2.2.0" = { - name = "_at_ampproject_slash_remapping"; - packageName = "@ampproject/remapping"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"; - sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; - }; - }; - "@babel/code-frame-7.18.6" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; - }; - }; - "@babel/compat-data-7.19.1" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz"; - sha512 = "72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="; - }; - }; - "@babel/core-7.19.1" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz"; - sha512 = "1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw=="; - }; - }; - "@babel/generator-7.19.0" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz"; - sha512 = "S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg=="; - }; - }; - "@babel/helper-annotate-as-pure-7.18.6" = { - name = "_at_babel_slash_helper-annotate-as-pure"; - packageName = "@babel/helper-annotate-as-pure"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; - sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; - }; - }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" = { - name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; - packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; - sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; - }; - }; - "@babel/helper-compilation-targets-7.19.1" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz"; - sha512 = "LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg=="; - }; - }; - "@babel/helper-create-class-features-plugin-7.19.0" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz"; - sha512 = "NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw=="; - }; - }; - "@babel/helper-create-regexp-features-plugin-7.19.0" = { - name = "_at_babel_slash_helper-create-regexp-features-plugin"; - packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"; - sha512 = "htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw=="; - }; - }; - "@babel/helper-define-polyfill-provider-0.3.3" = { - name = "_at_babel_slash_helper-define-polyfill-provider"; - packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"; - sha512 = "z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww=="; - }; - }; - "@babel/helper-environment-visitor-7.18.9" = { - name = "_at_babel_slash_helper-environment-visitor"; - packageName = "@babel/helper-environment-visitor"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; - sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.18.6" = { - name = "_at_babel_slash_helper-explode-assignable-expression"; - packageName = "@babel/helper-explode-assignable-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; - sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; - }; - }; - "@babel/helper-function-name-7.19.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; - }; - }; - "@babel/helper-hoist-variables-7.18.6" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.18.9" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; - sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; - }; - }; - "@babel/helper-module-imports-7.18.6" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; - }; - }; - "@babel/helper-module-transforms-7.19.0" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; - sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; - }; - }; - "@babel/helper-optimise-call-expression-7.18.6" = { - name = "_at_babel_slash_helper-optimise-call-expression"; - packageName = "@babel/helper-optimise-call-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; - sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; - }; - }; - "@babel/helper-plugin-utils-7.19.0" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.18.9" = { - name = "_at_babel_slash_helper-remap-async-to-generator"; - packageName = "@babel/helper-remap-async-to-generator"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; - sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; - }; - }; - "@babel/helper-replace-supers-7.19.1" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; - sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; - }; - }; - "@babel/helper-simple-access-7.18.6" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; - }; - }; - "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { - name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; - packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; - sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; - }; - }; - "@babel/helper-split-export-declaration-7.18.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; - }; - }; - "@babel/helper-string-parser-7.18.10" = { - name = "_at_babel_slash_helper-string-parser"; - packageName = "@babel/helper-string-parser"; - version = "7.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; - }; - }; - "@babel/helper-validator-identifier-7.19.1" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - }; - "@babel/helper-validator-option-7.18.6" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; - }; - }; - "@babel/helper-wrap-function-7.19.0" = { - name = "_at_babel_slash_helper-wrap-function"; - packageName = "@babel/helper-wrap-function"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"; - sha512 = "txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg=="; - }; - }; - "@babel/helpers-7.19.0" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; - sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; - }; - }; - "@babel/highlight-7.18.6" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; - }; - }; - "@babel/parser-7.19.1" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz"; - sha512 = "h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="; - }; - }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { - name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; - sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; - }; - }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = { - name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; - sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.19.1" = { - name = "_at_babel_slash_plugin-proposal-async-generator-functions"; - packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz"; - sha512 = "0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q=="; - }; - }; - "@babel/plugin-proposal-class-properties-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; - sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; - }; - }; - "@babel/plugin-proposal-class-static-block-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-class-static-block"; - packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; - sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; - }; - }; - "@babel/plugin-proposal-decorators-7.19.1" = { - name = "_at_babel_slash_plugin-proposal-decorators"; - packageName = "@babel/plugin-proposal-decorators"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.1.tgz"; - sha512 = "LfIKNBBY7Q1OX5C4xAgRQffOg2OnhAo9fnbcOHgOC9Yytm2Sw+4XqHufRYU86tHomzepxtvuVaNO+3EVKR4ivw=="; - }; - }; - "@babel/plugin-proposal-dynamic-import-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-dynamic-import"; - packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; - sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; - }; - }; - "@babel/plugin-proposal-export-namespace-from-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-export-namespace-from"; - packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; - sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; - }; - }; - "@babel/plugin-proposal-json-strings-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-json-strings"; - packageName = "@babel/plugin-proposal-json-strings"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; - sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; - }; - }; - "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; - packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; - sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; - }; - }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; - packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; - sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; - }; - }; - "@babel/plugin-proposal-numeric-separator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; - sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; - }; - }; - "@babel/plugin-proposal-object-rest-spread-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-object-rest-spread"; - packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; - }; - }; - "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; - packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; - sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; - }; - }; - "@babel/plugin-proposal-optional-chaining-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-optional-chaining"; - packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; - sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; - }; - }; - "@babel/plugin-proposal-private-methods-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-private-methods"; - packageName = "@babel/plugin-proposal-private-methods"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; - sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; - }; - }; - "@babel/plugin-proposal-private-property-in-object-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-private-property-in-object"; - packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; - sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; - }; - }; - "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; - packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; - sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; - }; - }; - "@babel/plugin-syntax-async-generators-7.8.4" = { - name = "_at_babel_slash_plugin-syntax-async-generators"; - packageName = "@babel/plugin-syntax-async-generators"; - version = "7.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - }; - "@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.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - }; - "@babel/plugin-syntax-class-static-block-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-class-static-block"; - packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; - sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; - }; - }; - "@babel/plugin-syntax-decorators-7.19.0" = { - name = "_at_babel_slash_plugin-syntax-decorators"; - packageName = "@babel/plugin-syntax-decorators"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz"; - sha512 = "xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ=="; - }; - }; - "@babel/plugin-syntax-dynamic-import-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-dynamic-import"; - packageName = "@babel/plugin-syntax-dynamic-import"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - }; - "@babel/plugin-syntax-export-namespace-from-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-export-namespace-from"; - packageName = "@babel/plugin-syntax-export-namespace-from"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - }; - "@babel/plugin-syntax-import-assertions-7.18.6" = { - name = "_at_babel_slash_plugin-syntax-import-assertions"; - packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; - sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; - }; - }; - "@babel/plugin-syntax-json-strings-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-json-strings"; - packageName = "@babel/plugin-syntax-json-strings"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - }; - "@babel/plugin-syntax-jsx-7.18.6" = { - name = "_at_babel_slash_plugin-syntax-jsx"; - packageName = "@babel/plugin-syntax-jsx"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; - sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; - }; - }; - "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; - packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - }; - "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; - packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - }; - "@babel/plugin-syntax-numeric-separator-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-numeric-separator"; - packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - }; - "@babel/plugin-syntax-object-rest-spread-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-object-rest-spread"; - packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - }; - "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; - packageName = "@babel/plugin-syntax-optional-catch-binding"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - }; - "@babel/plugin-syntax-optional-chaining-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-chaining"; - packageName = "@babel/plugin-syntax-optional-chaining"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - }; - "@babel/plugin-syntax-private-property-in-object-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-private-property-in-object"; - packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; - sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; - }; - }; - "@babel/plugin-syntax-top-level-await-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-top-level-await"; - packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; - }; - }; - "@babel/plugin-transform-arrow-functions-7.18.6" = { - name = "_at_babel_slash_plugin-transform-arrow-functions"; - packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; - sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; - }; - }; - "@babel/plugin-transform-async-to-generator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-async-to-generator"; - packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; - sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; - }; - }; - "@babel/plugin-transform-block-scoped-functions-7.18.6" = { - name = "_at_babel_slash_plugin-transform-block-scoped-functions"; - packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; - sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; - }; - }; - "@babel/plugin-transform-block-scoping-7.18.9" = { - name = "_at_babel_slash_plugin-transform-block-scoping"; - packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; - }; - }; - "@babel/plugin-transform-classes-7.19.0" = { - name = "_at_babel_slash_plugin-transform-classes"; - packageName = "@babel/plugin-transform-classes"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz"; - sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A=="; - }; - }; - "@babel/plugin-transform-computed-properties-7.18.9" = { - name = "_at_babel_slash_plugin-transform-computed-properties"; - packageName = "@babel/plugin-transform-computed-properties"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; - sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; - }; - }; - "@babel/plugin-transform-destructuring-7.18.13" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; - }; - }; - "@babel/plugin-transform-dotall-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-dotall-regex"; - packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; - sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; - }; - }; - "@babel/plugin-transform-duplicate-keys-7.18.9" = { - name = "_at_babel_slash_plugin-transform-duplicate-keys"; - packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; - sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; - }; - }; - "@babel/plugin-transform-exponentiation-operator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-exponentiation-operator"; - packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; - sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; - }; - }; - "@babel/plugin-transform-for-of-7.18.8" = { - name = "_at_babel_slash_plugin-transform-for-of"; - packageName = "@babel/plugin-transform-for-of"; - version = "7.18.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; - }; - }; - "@babel/plugin-transform-function-name-7.18.9" = { - name = "_at_babel_slash_plugin-transform-function-name"; - packageName = "@babel/plugin-transform-function-name"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; - sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; - }; - }; - "@babel/plugin-transform-literals-7.18.9" = { - name = "_at_babel_slash_plugin-transform-literals"; - packageName = "@babel/plugin-transform-literals"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; - sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; - }; - }; - "@babel/plugin-transform-member-expression-literals-7.18.6" = { - name = "_at_babel_slash_plugin-transform-member-expression-literals"; - packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; - sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; - }; - }; - "@babel/plugin-transform-modules-amd-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-amd"; - packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; - }; - }; - "@babel/plugin-transform-modules-commonjs-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-commonjs"; - packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; - }; - }; - "@babel/plugin-transform-modules-systemjs-7.19.0" = { - name = "_at_babel_slash_plugin-transform-modules-systemjs"; - packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz"; - sha512 = "x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A=="; - }; - }; - "@babel/plugin-transform-modules-umd-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-umd"; - packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; - sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; - }; - }; - "@babel/plugin-transform-named-capturing-groups-regex-7.19.1" = { - name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; - packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz"; - sha512 = "oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw=="; - }; - }; - "@babel/plugin-transform-new-target-7.18.6" = { - name = "_at_babel_slash_plugin-transform-new-target"; - packageName = "@babel/plugin-transform-new-target"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; - sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; - }; - }; - "@babel/plugin-transform-object-super-7.18.6" = { - name = "_at_babel_slash_plugin-transform-object-super"; - packageName = "@babel/plugin-transform-object-super"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; - sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; - }; - }; - "@babel/plugin-transform-parameters-7.18.8" = { - name = "_at_babel_slash_plugin-transform-parameters"; - packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; - }; - }; - "@babel/plugin-transform-property-literals-7.18.6" = { - name = "_at_babel_slash_plugin-transform-property-literals"; - packageName = "@babel/plugin-transform-property-literals"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; - sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; - }; - }; - "@babel/plugin-transform-regenerator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-regenerator"; - packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; - sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; - }; - }; - "@babel/plugin-transform-reserved-words-7.18.6" = { - name = "_at_babel_slash_plugin-transform-reserved-words"; - packageName = "@babel/plugin-transform-reserved-words"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; - sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; - }; - }; - "@babel/plugin-transform-runtime-7.19.1" = { - name = "_at_babel_slash_plugin-transform-runtime"; - packageName = "@babel/plugin-transform-runtime"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz"; - sha512 = "2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA=="; - }; - }; - "@babel/plugin-transform-shorthand-properties-7.18.6" = { - name = "_at_babel_slash_plugin-transform-shorthand-properties"; - packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; - }; - }; - "@babel/plugin-transform-spread-7.19.0" = { - name = "_at_babel_slash_plugin-transform-spread"; - packageName = "@babel/plugin-transform-spread"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz"; - sha512 = "RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w=="; - }; - }; - "@babel/plugin-transform-sticky-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-sticky-regex"; - packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; - sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; - }; - }; - "@babel/plugin-transform-template-literals-7.18.9" = { - name = "_at_babel_slash_plugin-transform-template-literals"; - packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; - sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; - }; - }; - "@babel/plugin-transform-typeof-symbol-7.18.9" = { - name = "_at_babel_slash_plugin-transform-typeof-symbol"; - packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; - sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; - }; - }; - "@babel/plugin-transform-unicode-escapes-7.18.10" = { - name = "_at_babel_slash_plugin-transform-unicode-escapes"; - packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; - sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; - }; - }; - "@babel/plugin-transform-unicode-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-unicode-regex"; - packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; - sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; - }; - }; - "@babel/preset-env-7.19.1" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz"; - sha512 = "c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA=="; - }; - }; - "@babel/preset-modules-0.1.5" = { - name = "_at_babel_slash_preset-modules"; - packageName = "@babel/preset-modules"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; - }; - }; - "@babel/runtime-7.19.0" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz"; - sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA=="; - }; - }; - "@babel/template-7.18.10" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; - }; - }; - "@babel/traverse-7.19.1" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz"; - sha512 = "0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA=="; - }; - }; - "@babel/types-7.19.0" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz"; - sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; - }; - }; - "@eslint/eslintrc-1.3.2" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz"; - sha512 = "AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ=="; - }; - }; - "@fortawesome/fontawesome-common-types-6.1.2" = { - name = "_at_fortawesome_slash_fontawesome-common-types"; - packageName = "@fortawesome/fontawesome-common-types"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz"; - sha512 = "wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA=="; - }; - }; - "@fortawesome/fontawesome-svg-core-6.1.2" = { - name = "_at_fortawesome_slash_fontawesome-svg-core"; - packageName = "@fortawesome/fontawesome-svg-core"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.2.tgz"; - sha512 = "853G/Htp0BOdXnPoeCPTjFrVwyrJHpe8MhjB/DYE9XjwhnNDfuBCd3aKc2YUYbEfHEcBws4UAA0kA9dymZKGjA=="; - }; - }; - "@fortawesome/free-solid-svg-icons-6.1.2" = { - name = "_at_fortawesome_slash_free-solid-svg-icons"; - packageName = "@fortawesome/free-solid-svg-icons"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.2.tgz"; - sha512 = "lTgZz+cMpzjkHmCwOG3E1ilUZrnINYdqMmrkv30EC3XbRsGlbIOL8H9LaNp5SV4g0pNJDfQ4EdTWWaMvdwyLiQ=="; - }; - }; - "@fortawesome/vue-fontawesome-3.0.1" = { - name = "_at_fortawesome_slash_vue-fontawesome"; - packageName = "@fortawesome/vue-fontawesome"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.1.tgz"; - sha512 = "CdXZJoCS+aEPec26ZP7hWWU3SaJlQPZSCGdgpQ2qGl2HUmtUUNrI3zC4XWdn1JUmh3t5OuDeRG1qB4eGRNSD4A=="; - }; - }; - "@hapi/hoek-9.3.0" = { - name = "_at_hapi_slash_hoek"; - packageName = "@hapi/hoek"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz"; - sha512 = "/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="; - }; - }; - "@hapi/topo-5.1.0" = { - name = "_at_hapi_slash_topo"; - packageName = "@hapi/topo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"; - sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; - }; - }; - "@humanwhocodes/config-array-0.9.5" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; - sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; - }; - }; - "@humanwhocodes/object-schema-1.2.1" = { - name = "_at_humanwhocodes_slash_object-schema"; - packageName = "@humanwhocodes/object-schema"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - }; - "@intlify/core-base-9.1.10" = { - name = "_at_intlify_slash_core-base"; - packageName = "@intlify/core-base"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.10.tgz"; - sha512 = "So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw=="; - }; - }; - "@intlify/devtools-if-9.1.10" = { - name = "_at_intlify_slash_devtools-if"; - packageName = "@intlify/devtools-if"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.10.tgz"; - sha512 = "SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ=="; - }; - }; - "@intlify/message-compiler-9.1.10" = { - name = "_at_intlify_slash_message-compiler"; - packageName = "@intlify/message-compiler"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.10.tgz"; - sha512 = "+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg=="; - }; - }; - "@intlify/message-resolver-9.1.10" = { - name = "_at_intlify_slash_message-resolver"; - packageName = "@intlify/message-resolver"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.10.tgz"; - sha512 = "5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w=="; - }; - }; - "@intlify/runtime-9.1.10" = { - name = "_at_intlify_slash_runtime"; - packageName = "@intlify/runtime"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.10.tgz"; - sha512 = "7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA=="; - }; - }; - "@intlify/shared-9.1.10" = { - name = "_at_intlify_slash_shared"; - packageName = "@intlify/shared"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.10.tgz"; - sha512 = "Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA=="; - }; - }; - "@intlify/vue-devtools-9.1.10" = { - name = "_at_intlify_slash_vue-devtools"; - packageName = "@intlify/vue-devtools"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.10.tgz"; - sha512 = "5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ=="; - }; - }; - "@jridgewell/gen-mapping-0.1.1" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; - }; - }; - "@jridgewell/gen-mapping-0.3.2" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; - sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; - }; - }; - "@jridgewell/resolve-uri-3.1.0" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; - }; - }; - "@jridgewell/set-array-1.1.2" = { - name = "_at_jridgewell_slash_set-array"; - packageName = "@jridgewell/set-array"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - }; - "@jridgewell/source-map-0.3.2" = { - name = "_at_jridgewell_slash_source-map"; - packageName = "@jridgewell/source-map"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.14" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; - }; - }; - "@jridgewell/trace-mapping-0.3.15" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; - sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; - }; - }; - "@leichtgewicht/ip-codec-2.0.4" = { - name = "_at_leichtgewicht_slash_ip-codec"; - packageName = "@leichtgewicht/ip-codec"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"; - sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; - }; - }; - "@node-ipc/js-queue-2.0.3" = { - name = "_at_node-ipc_slash_js-queue"; - packageName = "@node-ipc/js-queue"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"; - sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; - }; - }; - "@nodelib/fs.scandir-2.1.5" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - }; - "@nodelib/fs.stat-2.0.5" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - }; - "@nodelib/fs.walk-1.2.8" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - }; - "@polka/url-1.0.0-next.21" = { - name = "_at_polka_slash_url"; - packageName = "@polka/url"; - version = "1.0.0-next.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"; - sha512 = "a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="; - }; - }; - "@sideway/address-4.1.4" = { - name = "_at_sideway_slash_address"; - packageName = "@sideway/address"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz"; - sha512 = "7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw=="; - }; - }; - "@sideway/formula-3.0.0" = { - name = "_at_sideway_slash_formula"; - packageName = "@sideway/formula"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz"; - sha512 = "vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="; - }; - }; - "@sideway/pinpoint-2.0.0" = { - name = "_at_sideway_slash_pinpoint"; - packageName = "@sideway/pinpoint"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz"; - sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; - }; - }; - "@soda/friendly-errors-webpack-plugin-1.8.1" = { - name = "_at_soda_slash_friendly-errors-webpack-plugin"; - packageName = "@soda/friendly-errors-webpack-plugin"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; - sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; - }; - }; - "@soda/get-current-script-1.0.2" = { - name = "_at_soda_slash_get-current-script"; - packageName = "@soda/get-current-script"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; - sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; - }; - }; - "@trysound/sax-0.2.0" = { - name = "_at_trysound_slash_sax"; - packageName = "@trysound/sax"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"; - sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; - }; - }; - "@types/body-parser-1.19.2" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; - }; - }; - "@types/bonjour-3.5.10" = { - name = "_at_types_slash_bonjour"; - packageName = "@types/bonjour"; - version = "3.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"; - sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; - }; - }; - "@types/connect-3.4.35" = { - name = "_at_types_slash_connect"; - packageName = "@types/connect"; - version = "3.4.35"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; - }; - }; - "@types/connect-history-api-fallback-1.3.5" = { - name = "_at_types_slash_connect-history-api-fallback"; - packageName = "@types/connect-history-api-fallback"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"; - sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; - }; - }; - "@types/eslint-8.4.6" = { - name = "_at_types_slash_eslint"; - packageName = "@types/eslint"; - version = "8.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz"; - sha512 = "/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g=="; - }; - }; - "@types/eslint-scope-3.7.4" = { - name = "_at_types_slash_eslint-scope"; - packageName = "@types/eslint-scope"; - version = "3.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; - }; - }; - "@types/estree-0.0.51" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.51"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"; - sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; - }; - }; - "@types/express-4.17.14" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; - }; - }; - "@types/express-serve-static-core-4.17.31" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; - }; - }; - "@types/hammerjs-2.0.41" = { - name = "_at_types_slash_hammerjs"; - packageName = "@types/hammerjs"; - version = "2.0.41"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz"; - sha512 = "ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA=="; - }; - }; - "@types/html-minifier-terser-6.1.0" = { - name = "_at_types_slash_html-minifier-terser"; - packageName = "@types/html-minifier-terser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; - }; - }; - "@types/http-proxy-1.17.9" = { - name = "_at_types_slash_http-proxy"; - packageName = "@types/http-proxy"; - version = "1.17.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; - sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; - }; - }; - "@types/json-schema-7.0.11" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; - }; - }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; - "@types/marked-4.0.6" = { - name = "_at_types_slash_marked"; - packageName = "@types/marked"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/marked/-/marked-4.0.6.tgz"; - sha512 = "ITAVUzsnVbhy5afxhs4PPPbrv2hKVEDH5BhhaQNQlVG0UNu+9A18XSdYr53nBdHZ0ADEQLl+ciOjXbs7eHdiQQ=="; - }; - }; - "@types/mime-3.0.1" = { - name = "_at_types_slash_mime"; - packageName = "@types/mime"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"; - sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; - }; - }; - "@types/minimist-1.2.2" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; - }; - }; - "@types/node-18.7.18" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.7.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz"; - sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; - }; - }; - "@types/normalize-package-data-2.4.1" = { - name = "_at_types_slash_normalize-package-data"; - packageName = "@types/normalize-package-data"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; - sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; - }; - }; - "@types/parse-json-4.0.0" = { - name = "_at_types_slash_parse-json"; - packageName = "@types/parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - }; - "@types/qs-6.9.7" = { - name = "_at_types_slash_qs"; - packageName = "@types/qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; - }; - }; - "@types/range-parser-1.2.4" = { - name = "_at_types_slash_range-parser"; - packageName = "@types/range-parser"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; - }; - }; - "@types/retry-0.12.0" = { - name = "_at_types_slash_retry"; - packageName = "@types/retry"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; - }; - }; - "@types/serve-index-1.9.1" = { - name = "_at_types_slash_serve-index"; - packageName = "@types/serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; - }; - }; - "@types/serve-static-1.15.0" = { - name = "_at_types_slash_serve-static"; - packageName = "@types/serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; - }; - }; - "@types/sockjs-0.3.33" = { - name = "_at_types_slash_sockjs"; - packageName = "@types/sockjs"; - version = "0.3.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz"; - sha512 = "f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw=="; - }; - }; - "@types/web-bluetooth-0.0.15" = { - name = "_at_types_slash_web-bluetooth"; - packageName = "@types/web-bluetooth"; - version = "0.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.15.tgz"; - sha512 = "w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA=="; - }; - }; - "@types/webpack-env-1.18.0" = { - name = "_at_types_slash_webpack-env"; - packageName = "@types/webpack-env"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.0.tgz"; - sha512 = "56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg=="; - }; - }; - "@types/ws-8.5.3" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - }; - "@typescript-eslint/eslint-plugin-5.31.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz"; - sha512 = "VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ=="; - }; - }; - "@typescript-eslint/parser-5.31.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz"; - sha512 = "UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw=="; - }; - }; - "@typescript-eslint/scope-manager-5.31.0" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz"; - sha512 = "8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg=="; - }; - }; - "@typescript-eslint/type-utils-5.31.0" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz"; - sha512 = "7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w=="; - }; - }; - "@typescript-eslint/types-5.31.0" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz"; - sha512 = "/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g=="; - }; - }; - "@typescript-eslint/typescript-estree-5.31.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz"; - sha512 = "3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw=="; - }; - }; - "@typescript-eslint/utils-5.31.0" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz"; - sha512 = "kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg=="; - }; - }; - "@typescript-eslint/visitor-keys-5.31.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz"; - sha512 = "ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg=="; - }; - }; - "@vue/babel-helper-vue-jsx-merge-props-1.4.0" = { - name = "_at_vue_slash_babel-helper-vue-jsx-merge-props"; - packageName = "@vue/babel-helper-vue-jsx-merge-props"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz"; - sha512 = "JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="; - }; - }; - "@vue/babel-helper-vue-transform-on-1.0.2" = { - name = "_at_vue_slash_babel-helper-vue-transform-on"; - packageName = "@vue/babel-helper-vue-transform-on"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz"; - sha512 = "hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA=="; - }; - }; - "@vue/babel-plugin-jsx-1.1.1" = { - name = "_at_vue_slash_babel-plugin-jsx"; - packageName = "@vue/babel-plugin-jsx"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz"; - sha512 = "j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w=="; - }; - }; - "@vue/babel-plugin-transform-vue-jsx-1.4.0" = { - name = "_at_vue_slash_babel-plugin-transform-vue-jsx"; - packageName = "@vue/babel-plugin-transform-vue-jsx"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz"; - sha512 = "Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA=="; - }; - }; - "@vue/babel-preset-app-5.0.8" = { - name = "_at_vue_slash_babel-preset-app"; - packageName = "@vue/babel-preset-app"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz"; - sha512 = "yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg=="; - }; - }; - "@vue/babel-preset-jsx-1.4.0" = { - name = "_at_vue_slash_babel-preset-jsx"; - packageName = "@vue/babel-preset-jsx"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz"; - sha512 = "QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA=="; - }; - }; - "@vue/babel-sugar-composition-api-inject-h-1.4.0" = { - name = "_at_vue_slash_babel-sugar-composition-api-inject-h"; - packageName = "@vue/babel-sugar-composition-api-inject-h"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz"; - sha512 = "VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g=="; - }; - }; - "@vue/babel-sugar-composition-api-render-instance-1.4.0" = { - name = "_at_vue_slash_babel-sugar-composition-api-render-instance"; - packageName = "@vue/babel-sugar-composition-api-render-instance"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz"; - sha512 = "6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q=="; - }; - }; - "@vue/babel-sugar-functional-vue-1.4.0" = { - name = "_at_vue_slash_babel-sugar-functional-vue"; - packageName = "@vue/babel-sugar-functional-vue"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz"; - sha512 = "lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw=="; - }; - }; - "@vue/babel-sugar-inject-h-1.4.0" = { - name = "_at_vue_slash_babel-sugar-inject-h"; - packageName = "@vue/babel-sugar-inject-h"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz"; - sha512 = "muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA=="; - }; - }; - "@vue/babel-sugar-v-model-1.4.0" = { - name = "_at_vue_slash_babel-sugar-v-model"; - packageName = "@vue/babel-sugar-v-model"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz"; - sha512 = "0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ=="; - }; - }; - "@vue/babel-sugar-v-on-1.4.0" = { - name = "_at_vue_slash_babel-sugar-v-on"; - packageName = "@vue/babel-sugar-v-on"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz"; - sha512 = "m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA=="; - }; - }; - "@vue/cli-overlay-5.0.8" = { - name = "_at_vue_slash_cli-overlay"; - packageName = "@vue/cli-overlay"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz"; - sha512 = "KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ=="; - }; - }; - "@vue/cli-plugin-babel-5.0.8" = { - name = "_at_vue_slash_cli-plugin-babel"; - packageName = "@vue/cli-plugin-babel"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz"; - sha512 = "a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ=="; - }; - }; - "@vue/cli-plugin-eslint-5.0.8" = { - name = "_at_vue_slash_cli-plugin-eslint"; - packageName = "@vue/cli-plugin-eslint"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz"; - sha512 = "d11+I5ONYaAPW1KyZj9GlrV/E6HZePq5L5eAF5GgoVdu6sxr6bDgEoxzhcS1Pk2eh8rn1MxG/FyyR+eCBj/CNg=="; - }; - }; - "@vue/cli-plugin-router-5.0.8" = { - name = "_at_vue_slash_cli-plugin-router"; - packageName = "@vue/cli-plugin-router"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz"; - sha512 = "Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg=="; - }; - }; - "@vue/cli-plugin-typescript-5.0.8" = { - name = "_at_vue_slash_cli-plugin-typescript"; - packageName = "@vue/cli-plugin-typescript"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.8.tgz"; - sha512 = "JKJOwzJshBqsmp4yLBexwVMebOZ4VGJgbnYvmHVxasJOStF2RxwyW28ZF+zIvASGdat4sAUuo/3mAQyVhm7JHg=="; - }; - }; - "@vue/cli-plugin-vuex-5.0.8" = { - name = "_at_vue_slash_cli-plugin-vuex"; - packageName = "@vue/cli-plugin-vuex"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz"; - sha512 = "HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA=="; - }; - }; - "@vue/cli-service-5.0.8" = { - name = "_at_vue_slash_cli-service"; - packageName = "@vue/cli-service"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz"; - sha512 = "nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw=="; - }; - }; - "@vue/cli-shared-utils-5.0.8" = { - name = "_at_vue_slash_cli-shared-utils"; - packageName = "@vue/cli-shared-utils"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz"; - sha512 = "uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ=="; - }; - }; - "@vue/compiler-core-3.2.37" = { - name = "_at_vue_slash_compiler-core"; - packageName = "@vue/compiler-core"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz"; - sha512 = "81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg=="; - }; - }; - "@vue/compiler-dom-3.2.37" = { - name = "_at_vue_slash_compiler-dom"; - packageName = "@vue/compiler-dom"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz"; - sha512 = "yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ=="; - }; - }; - "@vue/compiler-sfc-3.2.37" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz"; - sha512 = "+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg=="; - }; - }; - "@vue/compiler-ssr-3.2.37" = { - name = "_at_vue_slash_compiler-ssr"; - packageName = "@vue/compiler-ssr"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz"; - sha512 = "7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw=="; - }; - }; - "@vue/component-compiler-utils-3.3.0" = { - name = "_at_vue_slash_component-compiler-utils"; - packageName = "@vue/component-compiler-utils"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; - sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; - }; - }; - "@vue/devtools-api-6.2.1" = { - name = "_at_vue_slash_devtools-api"; - packageName = "@vue/devtools-api"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz"; - sha512 = "OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="; - }; - }; - "@vue/eslint-config-standard-8.0.0" = { - name = "_at_vue_slash_eslint-config-standard"; - packageName = "@vue/eslint-config-standard"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-8.0.0.tgz"; - sha512 = "ikvNsEOz/43XF+oCibAKHSHVkKQBycJ+sVFsO4PTknttCyjclrBSOIUB/0pu/40Wq8zjFf4v/t+26TG551Z53w=="; - }; - }; - "@vue/eslint-config-typescript-11.0.0" = { - name = "_at_vue_slash_eslint-config-typescript"; - packageName = "@vue/eslint-config-typescript"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.0.tgz"; - sha512 = "txuRzxnQVmtUvvy9UyWUy9sHWXNeRPGmSPqP53hRtaiUeCTAondI9Ho9GQYI/8/eWljYOST7iA4Aa8sANBkWaA=="; - }; - }; - "@vue/reactivity-3.2.37" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz"; - sha512 = "/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A=="; - }; - }; - "@vue/reactivity-transform-3.2.37" = { - name = "_at_vue_slash_reactivity-transform"; - packageName = "@vue/reactivity-transform"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz"; - sha512 = "IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg=="; - }; - }; - "@vue/runtime-core-3.2.37" = { - name = "_at_vue_slash_runtime-core"; - packageName = "@vue/runtime-core"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz"; - sha512 = "JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ=="; - }; - }; - "@vue/runtime-dom-3.2.37" = { - name = "_at_vue_slash_runtime-dom"; - packageName = "@vue/runtime-dom"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz"; - sha512 = "HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw=="; - }; - }; - "@vue/server-renderer-3.2.37" = { - name = "_at_vue_slash_server-renderer"; - packageName = "@vue/server-renderer"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz"; - sha512 = "kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA=="; - }; - }; - "@vue/shared-3.2.37" = { - name = "_at_vue_slash_shared"; - packageName = "@vue/shared"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz"; - sha512 = "4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="; - }; - }; - "@vue/vue-loader-v15-15.10.0" = { - name = "_at_vue_slash_vue-loader-v15"; - packageName = "@vue/vue-loader-v15"; - version = "15.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; - sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; - }; - }; - "@vue/web-component-wrapper-1.3.0" = { - name = "_at_vue_slash_web-component-wrapper"; - packageName = "@vue/web-component-wrapper"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; - sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; - }; - }; - "@vueuse/core-9.1.1" = { - name = "_at_vueuse_slash_core"; - packageName = "@vueuse/core"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/core/-/core-9.1.1.tgz"; - sha512 = "QfuaNWRDMQcCUwXylCyYhPC3ScS9Tiiz4J0chdwr3vOemBwRToSywq8MP+ZegKYFnbETzRY8G/5zC+ca30wrRQ=="; - }; - }; - "@vueuse/metadata-9.1.1" = { - name = "_at_vueuse_slash_metadata"; - packageName = "@vueuse/metadata"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.1.1.tgz"; - sha512 = "XZ2KtSW+85LLHB/IdGILPAtbIVHasPsAW7aqz3BRMzJdAQWRiM/FGa1OKBwLbXtUw/AmjKYFlZJo7eOFIBXRog=="; - }; - }; - "@vueuse/shared-9.1.1" = { - name = "_at_vueuse_slash_shared"; - packageName = "@vueuse/shared"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/shared/-/shared-9.1.1.tgz"; - sha512 = "c+IfcOYmHiHqoEa3ED1Tbpue5GHmoUmTp8PtO4YbczthtY155Rt6DmWhjxMLXBF1Bcidagxljmp/7xtAzEHXLw=="; - }; - }; - "@webassemblyjs/ast-1.11.1" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"; - sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; - sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; - }; - }; - "@webassemblyjs/helper-api-error-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; - sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; - }; - }; - "@webassemblyjs/helper-buffer-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; - sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; - }; - }; - "@webassemblyjs/helper-numbers-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-numbers"; - packageName = "@webassemblyjs/helper-numbers"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; - sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; - sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; - }; - }; - "@webassemblyjs/helper-wasm-section-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; - sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; - }; - }; - "@webassemblyjs/ieee754-1.11.1" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; - sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; - }; - }; - "@webassemblyjs/leb128-1.11.1" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; - sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; - }; - }; - "@webassemblyjs/utf8-1.11.1" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; - sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; - }; - }; - "@webassemblyjs/wasm-edit-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; - sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; - }; - }; - "@webassemblyjs/wasm-gen-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; - sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; - }; - }; - "@webassemblyjs/wasm-opt-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; - sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; - }; - }; - "@webassemblyjs/wasm-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; - sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; - }; - }; - "@webassemblyjs/wast-printer-1.11.1" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; - sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; - }; - }; - "@xtuc/ieee754-1.2.0" = { - name = "_at_xtuc_slash_ieee754"; - packageName = "@xtuc/ieee754"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - }; - "@xtuc/long-4.2.2" = { - name = "_at_xtuc_slash_long"; - packageName = "@xtuc/long"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "acorn-8.8.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; - sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; - }; - }; - "acorn-import-assertions-1.8.0" = { - name = "acorn-import-assertions"; - packageName = "acorn-import-assertions"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; - sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; - }; - }; - "acorn-jsx-5.3.2" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - }; - "acorn-walk-8.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; - }; - }; - "address-1.2.1" = { - name = "address"; - packageName = "address"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.2.1.tgz"; - sha512 = "B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA=="; - }; - }; - "ajv-6.12.6" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - }; - "ajv-8.11.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"; - sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; - }; - }; - "ajv-formats-2.1.1" = { - name = "ajv-formats"; - packageName = "ajv-formats"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"; - sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; - }; - }; - "ajv-keywords-3.5.2" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - }; - "ajv-keywords-5.1.0" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"; - sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; - }; - }; - "ansi-escapes-3.2.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - }; - "ansi-html-community-0.0.8" = { - name = "ansi-html-community"; - packageName = "ansi-html-community"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"; - sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; - }; - }; - "ansi-regex-3.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; - sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - 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=="; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; - }; - }; - "anymatch-3.1.2" = { - name = "anymatch"; - packageName = "anymatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; - }; - }; - "arch-2.2.0" = { - name = "arch"; - packageName = "arch"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"; - sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; - }; - }; - "argparse-1.0.10" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "array-flatten-2.1.2" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; - }; - }; - "array-includes-3.1.5" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; - }; - }; - "array-union-2.1.0" = { - name = "array-union"; - packageName = "array-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - }; - "array.prototype.flat-1.3.0" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz"; - sha512 = "12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw=="; - }; - }; - "async-2.6.4" = { - name = "async"; - packageName = "async"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; - sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; - }; - }; - "at-least-node-1.0.0" = { - name = "at-least-node"; - packageName = "at-least-node"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - }; - "autoprefixer-10.4.11" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "10.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.11.tgz"; - sha512 = "5lHp6DgRodxlBLSkzHOTcufWFflH1ewfy2hvFQyjrblBFlP/0Yh4O/Wrg4ow8WRlN3AAUFFLAQwX8hTptzqVHg=="; - }; - }; - "babel-loader-8.2.5" = { - name = "babel-loader"; - packageName = "babel-loader"; - version = "8.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz"; - sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="; - }; - }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; - }; - }; - "babel-plugin-polyfill-corejs2-0.3.3" = { - name = "babel-plugin-polyfill-corejs2"; - packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"; - sha512 = "8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q=="; - }; - }; - "babel-plugin-polyfill-corejs3-0.6.0" = { - name = "babel-plugin-polyfill-corejs3"; - packageName = "babel-plugin-polyfill-corejs3"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"; - sha512 = "+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA=="; - }; - }; - "babel-plugin-polyfill-regenerator-0.4.1" = { - name = "babel-plugin-polyfill-regenerator"; - packageName = "babel-plugin-polyfill-regenerator"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"; - sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "batch-0.6.1" = { - name = "batch"; - packageName = "batch"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; - sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; - }; - }; - "big.js-5.2.2" = { - name = "big.js"; - packageName = "big.js"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - }; - "binary-extensions-2.2.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; - }; - }; - "bl-4.1.0" = { - name = "bl"; - packageName = "bl"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - }; - "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=="; - }; - }; - "body-parser-1.20.0" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; - }; - }; - "bonjour-service-1.0.14" = { - name = "bonjour-service"; - packageName = "bonjour-service"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz"; - sha512 = "HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ=="; - }; - }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; - "browserslist-4.21.4" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "buffer-from-1.1.2" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - }; - "builtins-5.0.1" = { - name = "builtins"; - packageName = "builtins"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz"; - sha512 = "qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "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=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "camel-case-4.1.2" = { - name = "camel-case"; - packageName = "camel-case"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - }; - "camelcase-5.3.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - }; - "camelcase-6.3.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - }; - "caniuse-api-3.0.0" = { - name = "caniuse-api"; - packageName = "caniuse-api"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; - }; - }; - "caniuse-lite-1.0.30001402" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001402"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001402.tgz"; - sha512 = "Mx4MlhXO5NwuvXGgVb+hg65HZ+bhUYsz8QtDGDo2QmaJS2GBX47Xfi2koL86lc8K+l+htXeTEB/Aeqvezoo6Ew=="; - }; - }; - "case-sensitive-paths-webpack-plugin-2.4.0" = { - name = "case-sensitive-paths-webpack-plugin"; - packageName = "case-sensitive-paths-webpack-plugin"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"; - sha512 = "roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="; - }; - }; - "chalk-2.4.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chalk-3.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "chokidar-3.5.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - }; - "chrome-trace-event-1.0.3" = { - name = "chrome-trace-event"; - packageName = "chrome-trace-event"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - }; - "ci-info-1.6.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz"; - sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="; - }; - }; - "clean-css-5.3.1" = { - name = "clean-css"; - packageName = "clean-css"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz"; - sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="; - }; - }; - "cli-cursor-3.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - }; - "cli-highlight-2.1.11" = { - name = "cli-highlight"; - packageName = "cli-highlight"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; - sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; - }; - }; - "cli-spinners-2.7.0" = { - name = "cli-spinners"; - packageName = "cli-spinners"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz"; - sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; - }; - }; - "clipboardy-2.3.0" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz"; - sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - }; - "clone-1.0.4" = { - name = "clone"; - packageName = "clone"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; - sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; - }; - }; - "clone-deep-4.0.1" = { - name = "clone-deep"; - packageName = "clone-deep"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"; - sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - 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" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - }; - "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=="; - }; - }; - "colord-2.9.3" = { - name = "colord"; - packageName = "colord"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"; - sha512 = "jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="; - }; - }; - "colorette-2.0.19" = { - name = "colorette"; - packageName = "colorette"; - version = "2.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"; - sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; - }; - }; - "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 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; - "commondir-1.0.1" = { - name = "commondir"; - packageName = "commondir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; - sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "connect-history-api-fallback-2.0.0" = { - name = "connect-history-api-fallback"; - packageName = "connect-history-api-fallback"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"; - sha512 = "U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="; - }; - }; - "consolidate-0.15.1" = { - name = "consolidate"; - packageName = "consolidate"; - version = "0.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; - sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; - }; - }; - "convert-source-map-1.8.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; - }; - }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "copy-webpack-plugin-9.1.0" = { - name = "copy-webpack-plugin"; - packageName = "copy-webpack-plugin"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz"; - sha512 = "rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA=="; - }; - }; - "core-js-3.25.0" = { - name = "core-js"; - packageName = "core-js"; - version = "3.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz"; - sha512 = "CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA=="; - }; - }; - "core-js-compat-3.25.1" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.25.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.1.tgz"; - sha512 = "pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw=="; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "cosmiconfig-6.0.0" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; - }; - }; - "cosmiconfig-7.0.1" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A=="; - }; - }; - "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=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "css-declaration-sorter-6.3.1" = { - name = "css-declaration-sorter"; - packageName = "css-declaration-sorter"; - version = "6.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz"; - sha512 = "fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w=="; - }; - }; - "css-loader-6.7.1" = { - name = "css-loader"; - packageName = "css-loader"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; - }; - }; - "css-minimizer-webpack-plugin-3.4.1" = { - name = "css-minimizer-webpack-plugin"; - packageName = "css-minimizer-webpack-plugin"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; - sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; - }; - }; - "css-select-4.3.0" = { - name = "css-select"; - packageName = "css-select"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"; - sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; - }; - }; - "css-tree-1.1.3" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; - sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; - }; - }; - "css-what-6.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"; - sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; - }; - }; - "cssesc-3.0.0" = { - name = "cssesc"; - packageName = "cssesc"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; - }; - }; - "cssnano-5.1.13" = { - name = "cssnano"; - packageName = "cssnano"; - version = "5.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz"; - sha512 = "S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ=="; - }; - }; - "cssnano-preset-default-5.2.12" = { - name = "cssnano-preset-default"; - packageName = "cssnano-preset-default"; - version = "5.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz"; - sha512 = "OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew=="; - }; - }; - "cssnano-utils-3.1.0" = { - name = "cssnano-utils"; - packageName = "cssnano-utils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; - sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; - }; - }; - "csso-4.2.0" = { - name = "csso"; - packageName = "csso"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; - sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; - }; - }; - "csstype-2.6.21" = { - name = "csstype"; - packageName = "csstype"; - version = "2.6.21"; - src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz"; - sha512 = "Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; - "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-4.2.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; - }; - }; - "default-gateway-6.0.3" = { - name = "default-gateway"; - packageName = "default-gateway"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"; - sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha512 = "s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="; - }; - }; - "define-lazy-prop-2.0.0" = { - name = "define-lazy-prop"; - packageName = "define-lazy-prop"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - }; - "define-properties-1.1.4" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - }; - "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.2.0" = { - name = "destroy"; - packageName = "destroy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; - }; - }; - "detect-node-2.1.0" = { - name = "detect-node"; - packageName = "detect-node"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"; - sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; - }; - }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - }; - "dns-equal-1.0.0" = { - name = "dns-equal"; - packageName = "dns-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; - sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; - }; - }; - "dns-packet-5.4.0" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz"; - sha512 = "EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g=="; - }; - }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; - "doctrine-3.0.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - }; - "dom-converter-0.2.0" = { - name = "dom-converter"; - packageName = "dom-converter"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; - }; - }; - "dom-serializer-1.4.1" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; - sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; - }; - }; - "domelementtype-2.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; - sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; - }; - }; - "domhandler-4.3.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - }; - "domutils-2.8.0" = { - name = "domutils"; - packageName = "domutils"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; - sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; - }; - }; - "dot-case-3.0.4" = { - name = "dot-case"; - packageName = "dot-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - }; - "dotenv-10.0.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"; - sha512 = "rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="; - }; - }; - "dotenv-expand-5.1.0" = { - name = "dotenv-expand"; - packageName = "dotenv-expand"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - }; - "duplexer-0.1.2" = { - name = "duplexer"; - packageName = "duplexer"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; - sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; - }; - }; - "easy-stack-1.0.1" = { - name = "easy-stack"; - packageName = "easy-stack"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz"; - sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "electron-to-chromium-1.4.254" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.254"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz"; - sha512 = "Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="; - }; - }; - "emoji-regex-8.0.0" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - }; - "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 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "enhanced-resolve-5.10.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "5.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"; - sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ=="; - }; - }; - "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=="; - }; - }; - "error-ex-1.3.2" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - }; - "error-stack-parser-2.1.4" = { - name = "error-stack-parser"; - packageName = "error-stack-parser"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"; - sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; - }; - }; - "es-abstract-1.20.2" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz"; - sha512 = "XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ=="; - }; - }; - "es-module-lexer-0.9.3" = { - name = "es-module-lexer"; - packageName = "es-module-lexer"; - version = "0.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; - sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; - }; - }; - "es-shim-unscopables-1.0.0" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - }; - "escape-string-regexp-4.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - }; - "eslint-8.20.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz"; - sha512 = "d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA=="; - }; - }; - "eslint-config-standard-17.0.0" = { - name = "eslint-config-standard"; - packageName = "eslint-config-standard"; - version = "17.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz"; - sha512 = "/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg=="; - }; - }; - "eslint-import-resolver-custom-alias-1.3.0" = { - name = "eslint-import-resolver-custom-alias"; - packageName = "eslint-import-resolver-custom-alias"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-custom-alias/-/eslint-import-resolver-custom-alias-1.3.0.tgz"; - sha512 = "9rrpduF6/SZHFXrJgjeA+edJek6xulplYfo/UJvLPrY38O9UY00rAq76dHRnZ289yftc5NIfx3THi0IILRQ3dg=="; - }; - }; - "eslint-import-resolver-node-0.3.6" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; - }; - }; - "eslint-module-utils-2.7.4" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"; - sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; - }; - }; - "eslint-plugin-es-3.0.1" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz"; - sha512 = "GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ=="; - }; - }; - "eslint-plugin-es-4.1.0" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz"; - sha512 = "GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ=="; - }; - }; - "eslint-plugin-import-2.26.0" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; - }; - }; - "eslint-plugin-n-15.2.5" = { - name = "eslint-plugin-n"; - packageName = "eslint-plugin-n"; - version = "15.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz"; - sha512 = "8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g=="; - }; - }; - "eslint-plugin-node-11.1.0" = { - name = "eslint-plugin-node"; - packageName = "eslint-plugin-node"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz"; - sha512 = "oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g=="; - }; - }; - "eslint-plugin-promise-6.0.0" = { - name = "eslint-plugin-promise"; - packageName = "eslint-plugin-promise"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz"; - sha512 = "7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw=="; - }; - }; - "eslint-plugin-vue-9.3.0" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.3.0.tgz"; - sha512 = "iscKKkBZgm6fGZwFt6poRoWC0Wy2dQOlwUPW++CiPoQiw1enctV2Hj5DBzzjJZfyqs+FAXhgzL4q0Ww03AgSmQ=="; - }; - }; - "eslint-scope-5.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - }; - "eslint-scope-7.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - }; - "eslint-utils-2.1.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; - }; - }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; - "eslint-visitor-keys-1.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; - }; - }; - "eslint-visitor-keys-2.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - }; - "eslint-visitor-keys-3.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - }; - "eslint-webpack-plugin-3.2.0" = { - name = "eslint-webpack-plugin"; - packageName = "eslint-webpack-plugin"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz"; - sha512 = "avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w=="; - }; - }; - "espree-9.4.0" = { - name = "espree"; - packageName = "espree"; - version = "9.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz"; - sha512 = "DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw=="; - }; - }; - "esprima-4.0.1" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - }; - "esquery-1.4.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - }; - "esrecurse-4.3.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - }; - "estraverse-4.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - }; - "estree-walker-2.0.2" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"; - sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; - }; - }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "event-pubsub-4.3.0" = { - name = "event-pubsub"; - packageName = "event-pubsub"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz"; - sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; - }; - }; - "eventemitter3-4.0.7" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - }; - "events-3.3.0" = { - name = "events"; - packageName = "events"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - }; - "execa-0.8.0" = { - name = "execa"; - packageName = "execa"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha512 = "zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA=="; - }; - }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - }; - "execa-5.1.1" = { - name = "execa"; - packageName = "execa"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; - }; - }; - "express-4.18.1" = { - name = "express"; - packageName = "express"; - version = "4.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; - sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; - }; - }; - "fast-deep-equal-3.1.3" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - }; - "fast-glob-3.2.12" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"; - sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; - }; - }; - "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 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; - "fastq-1.13.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; - }; - }; - "faye-websocket-0.11.4" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"; - sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; - }; - }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "finalhandler-1.2.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - }; - "find-cache-dir-3.3.2" = { - name = "find-cache-dir"; - packageName = "find-cache-dir"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; - sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; - }; - }; - "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=="; - }; - }; - "flat-cache-3.0.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - }; - "flatted-3.2.7" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "fork-ts-checker-webpack-plugin-6.5.2" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz"; - sha512 = "m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fraction.js-4.2.0" = { - name = "fraction.js"; - packageName = "fraction.js"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; - sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "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-monkey-1.0.3" = { - name = "fs-monkey"; - packageName = "fs-monkey"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz"; - sha512 = "cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "fsevents-2.3.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - }; - "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=="; - }; - }; - "function.prototype.name-1.1.5" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - }; - "functional-red-black-tree-1.0.1" = { - name = "functional-red-black-tree"; - packageName = "functional-red-black-tree"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; - "get-caller-file-2.0.5" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - }; - "get-intrinsic-1.1.3" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; - }; - }; - "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=="; - }; - }; - "get-stream-6.0.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"; - sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - }; - "glob-parent-6.0.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - }; - "glob-to-regexp-0.4.1" = { - name = "glob-to-regexp"; - packageName = "glob-to-regexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; - sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; - }; - }; - "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 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - }; - "globals-13.17.0" = { - name = "globals"; - packageName = "globals"; - version = "13.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; - }; - }; - "globby-11.1.0" = { - name = "globby"; - packageName = "globby"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - }; - "graceful-fs-4.2.10" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - }; - "gzip-size-6.0.0" = { - name = "gzip-size"; - packageName = "gzip-size"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"; - sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; - }; - }; - "hammerjs-2.0.8" = { - name = "hammerjs"; - packageName = "hammerjs"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz"; - sha512 = "tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ=="; - }; - }; - "handle-thing-2.0.1" = { - name = "handle-thing"; - packageName = "handle-thing"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; - sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; - }; - }; - "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-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "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"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "has-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "hash-sum-1.0.2" = { - name = "hash-sum"; - packageName = "hash-sum"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; - sha512 = "fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA=="; - }; - }; - "hash-sum-2.0.0" = { - name = "hash-sum"; - packageName = "hash-sum"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz"; - sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; - }; - }; - "he-1.2.0" = { - name = "he"; - packageName = "he"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; - }; - }; - "highlight.js-10.7.3" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "10.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; - sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; - }; - }; - "hosted-git-info-2.8.9" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; - }; - }; - "hpack.js-2.1.6" = { - name = "hpack.js"; - packageName = "hpack.js"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; - sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; - }; - }; - "html-entities-2.3.3" = { - name = "html-entities"; - packageName = "html-entities"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"; - sha512 = "DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="; - }; - }; - "html-minifier-terser-6.1.0" = { - name = "html-minifier-terser"; - packageName = "html-minifier-terser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw=="; - }; - }; - "html-tags-2.0.0" = { - name = "html-tags"; - packageName = "html-tags"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz"; - sha512 = "+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g=="; - }; - }; - "html-tags-3.2.0" = { - name = "html-tags"; - packageName = "html-tags"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz"; - sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg=="; - }; - }; - "html-webpack-plugin-5.5.0" = { - name = "html-webpack-plugin"; - packageName = "html-webpack-plugin"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz"; - sha512 = "sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw=="; - }; - }; - "htmlparser2-6.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; - sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; - }; - }; - "http-deceiver-1.2.7" = { - name = "http-deceiver"; - packageName = "http-deceiver"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; - sha512 = "LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="; - }; - }; - "http-errors-1.6.3" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha512 = "lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="; - }; - }; - "http-errors-2.0.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - }; - "http-parser-js-0.5.8" = { - name = "http-parser-js"; - packageName = "http-parser-js"; - version = "0.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"; - sha512 = "SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="; - }; - }; - "http-proxy-1.18.1" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - }; - "http-proxy-middleware-2.0.6" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"; - sha512 = "ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="; - }; - }; - "human-signals-2.1.0" = { - name = "human-signals"; - packageName = "human-signals"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"; - sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; - }; - }; - "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=="; - }; - }; - "icss-utils-5.1.0" = { - name = "icss-utils"; - packageName = "icss-utils"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; - sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; - }; - }; - "ieee754-1.2.1" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "ignore-5.2.0" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - }; - "immutable-4.1.0" = { - name = "immutable"; - packageName = "immutable"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz"; - sha512 = "oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="; - }; - }; - "import-fresh-3.3.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "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"; - sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; - }; - }; - "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 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "internal-slot-1.0.3" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - }; - "ipaddr.js-1.9.1" = { - 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 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "ipaddr.js-2.0.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; - sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-binary-path-2.1.0" = { - name = "is-binary-path"; - packageName = "is-binary-path"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-callable-1.2.6" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz"; - sha512 = "krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="; - }; - }; - "is-ci-1.2.1" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz"; - sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; - }; - }; - "is-core-module-2.10.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"; - sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "is-docker-2.2.1" = { - name = "is-docker"; - packageName = "is-docker"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "is-file-esm-1.0.0" = { - name = "is-file-esm"; - packageName = "is-file-esm"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-file-esm/-/is-file-esm-1.0.0.tgz"; - sha512 = "rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA=="; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; - }; - }; - "is-fullwidth-code-point-3.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-interactive-1.0.0" = { - name = "is-interactive"; - packageName = "is-interactive"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"; - sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-plain-obj-3.0.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; - sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; - }; - }; - "is-stream-2.0.1" = { - name = "is-stream"; - packageName = "is-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-unicode-supported-0.1.0" = { - name = "is-unicode-supported"; - packageName = "is-unicode-supported"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; - sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "is-wsl-2.2.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; - }; - }; - "javascript-stringify-2.1.0" = { - name = "javascript-stringify"; - packageName = "javascript-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz"; - sha512 = "JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="; - }; - }; - "jest-worker-27.5.1" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"; - sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; - }; - }; - "jest-worker-28.1.3" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"; - sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; - }; - }; - "joi-17.6.0" = { - name = "joi"; - packageName = "joi"; - version = "17.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz"; - sha512 = "OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw=="; - }; - }; - "js-message-1.0.7" = { - name = "js-message"; - packageName = "js-message"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz"; - sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; - }; - }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; - "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=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "js-yaml-loader-1.2.2" = { - name = "js-yaml-loader"; - packageName = "js-yaml-loader"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml-loader/-/js-yaml-loader-1.2.2.tgz"; - sha512 = "H+NeuNrG6uOs/WMjna2SjkaCw13rMWiT/D7l9+9x5n8aq88BDsh2sRmdfxckWPIHtViYHWRG6XiCKYvS1dfyLg=="; - }; - }; - "jsesc-0.5.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; - }; - }; - "jsesc-2.5.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - }; - "json-parse-better-errors-1.0.2" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; - }; - }; - "json-parse-even-better-errors-2.3.1" = { - name = "json-parse-even-better-errors"; - packageName = "json-parse-even-better-errors"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - }; - "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 = "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"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - }; - "json5-1.0.1" = { - name = "json5"; - packageName = "json5"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - }; - "json5-2.2.1" = { - name = "json5"; - packageName = "json5"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "kind-of-6.0.3" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - }; - "klona-2.0.5" = { - name = "klona"; - packageName = "klona"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"; - sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="; - }; - }; - "launch-editor-2.6.0" = { - name = "launch-editor"; - packageName = "launch-editor"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"; - sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; - }; - }; - "launch-editor-middleware-2.6.0" = { - name = "launch-editor-middleware"; - packageName = "launch-editor-middleware"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz"; - sha512 = "K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA=="; - }; - }; - "levn-0.4.1" = { - name = "levn"; - packageName = "levn"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - }; - "lilconfig-2.0.6" = { - name = "lilconfig"; - packageName = "lilconfig"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; - }; - }; - "lines-and-columns-1.2.4" = { - name = "lines-and-columns"; - packageName = "lines-and-columns"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - }; - "loader-runner-4.3.0" = { - name = "loader-runner"; - packageName = "loader-runner"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"; - sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; - }; - }; - "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 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; - }; - }; - "loader-utils-2.0.2" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; - }; - }; - "locate-path-5.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; - }; - }; - "lodash.defaultsdeep-4.6.1" = { - name = "lodash.defaultsdeep"; - packageName = "lodash.defaultsdeep"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; - sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; - }; - }; - "lodash.kebabcase-4.1.1" = { - name = "lodash.kebabcase"; - packageName = "lodash.kebabcase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; - }; - }; - "lodash.mapvalues-4.6.0" = { - name = "lodash.mapvalues"; - packageName = "lodash.mapvalues"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha512 = "JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ=="; - }; - }; - "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"; - sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="; - }; - }; - "lodash.merge-4.6.2" = { - name = "lodash.merge"; - packageName = "lodash.merge"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; - }; - }; - "log-symbols-4.1.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; - sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; - }; - }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg=="; - }; - }; - "lower-case-2.0.2" = { - name = "lower-case"; - packageName = "lower-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - 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=="; - }; - }; - "magic-string-0.25.9" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.9"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; - }; - }; - "make-dir-3.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - }; - "marked-4.0.19" = { - name = "marked"; - packageName = "marked"; - version = "4.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.19.tgz"; - sha512 = "rgQF/OxOiLcvgUAj1Q1tAf4Bgxn5h5JZTp04Fx4XUkVhs7B+7YA9JEWJhJpoO8eJt8MkZMwqLCNeNqj1bCREZQ=="; - }; - }; - "mdn-data-2.0.14" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; - sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "memfs-3.4.7" = { - name = "memfs"; - packageName = "memfs"; - version = "3.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz"; - sha512 = "ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "merge-source-map-1.1.0" = { - name = "merge-source-map"; - packageName = "merge-source-map"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; - sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; - }; - }; - "merge-stream-2.0.0" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "micromatch-4.0.5" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - }; - "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=="; - }; - }; - "mini-css-extract-plugin-2.6.1" = { - name = "mini-css-extract-plugin"; - packageName = "mini-css-extract-plugin"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz"; - sha512 = "wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg=="; - }; - }; - "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.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimist-1.2.6" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; - }; - }; - "minipass-3.3.5" = { - name = "minipass"; - packageName = "minipass"; - version = "3.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; - sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; - }; - }; - "mkdirp-0.5.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - }; - "module-alias-2.2.2" = { - name = "module-alias"; - packageName = "module-alias"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz"; - sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; - }; - }; - "mosha-vue-toastify-1.0.23" = { - name = "mosha-vue-toastify"; - packageName = "mosha-vue-toastify"; - version = "1.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/mosha-vue-toastify/-/mosha-vue-toastify-1.0.23.tgz"; - sha512 = "K9fij3e3H+E/Lj82ISrgmyKrtM5RNmtZC/KG/KH47+oZGmzAkN/Zuz39kBdT/Mp8OxaHuIWQntEUMP+HdmK1xA=="; - }; - }; - "mrmime-1.0.1" = { - name = "mrmime"; - packageName = "mrmime"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"; - sha512 = "hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - 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=="; - }; - }; - "multicast-dns-7.2.5" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "7.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"; - sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; - }; - }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - }; - "nanoid-3.3.4" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; - }; - }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; - "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=="; - }; - }; - "no-case-3.0.4" = { - name = "no-case"; - packageName = "no-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - }; - "node-fetch-2.6.7" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; - }; - }; - "node-forge-1.3.1" = { - name = "node-forge"; - packageName = "node-forge"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; - sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; - }; - }; - "node-releases-2.0.6" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; - }; - }; - "normalize-package-data-2.5.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; - }; - }; - "normalize-path-1.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; - sha512 = "7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA=="; - }; - }; - "normalize-path-3.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - }; - "normalize-range-0.1.2" = { - name = "normalize-range"; - packageName = "normalize-range"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; - sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; - }; - }; - "normalize-url-6.1.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - }; - "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"; - sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; - }; - }; - "npm-run-path-4.0.1" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; - }; - }; - "nth-check-2.1.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"; - sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object.assign-4.1.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; - sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; - }; - }; - "object.values-1.1.5" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; - }; - }; - "obuf-1.1.2" = { - name = "obuf"; - packageName = "obuf"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; - sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; - }; - }; - "on-finished-2.4.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; - }; - }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "open-8.4.0" = { - name = "open"; - packageName = "open"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; - }; - }; - "opener-1.5.2" = { - name = "opener"; - packageName = "opener"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"; - sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; - }; - }; - "optionator-0.9.1" = { - name = "optionator"; - packageName = "optionator"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - }; - "ora-5.4.1" = { - name = "ora"; - packageName = "ora"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; - sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; - "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-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-retry-4.6.2" = { - name = "p-retry"; - packageName = "p-retry"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"; - sha512 = "312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="; - }; - }; - "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=="; - }; - }; - "param-case-3.0.4" = { - name = "param-case"; - packageName = "param-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - }; - "parent-module-1.0.1" = { - name = "parent-module"; - packageName = "parent-module"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - }; - "parse-json-5.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - }; - "parse5-5.1.1" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; - }; - }; - "parse5-6.0.1" = { - name = "parse5"; - packageName = "parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - }; - "parse5-htmlparser2-tree-adapter-6.0.1" = { - name = "parse5-htmlparser2-tree-adapter"; - packageName = "parse5-htmlparser2-tree-adapter"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; - sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "pascal-case-3.1.2" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; - }; - }; - "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"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "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"; - sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "picocolors-0.2.1" = { - name = "picocolors"; - packageName = "picocolors"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; - }; - }; - "picocolors-1.0.0" = { - name = "picocolors"; - packageName = "picocolors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - }; - "picomatch-2.3.1" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - }; - "pinia-2.0.21" = { - name = "pinia"; - packageName = "pinia"; - version = "2.0.21"; - src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.21.tgz"; - sha512 = "6ol04PtL29O0Z6JHI47O3JUSoyOJ7Og0rstXrHVMZSP4zAldsQBXJCNF0i/H7m8vp/Hjd/CSmuPl7C5QAwpeWQ=="; - }; - }; - "pkg-dir-4.2.0" = { - name = "pkg-dir"; - packageName = "pkg-dir"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; - }; - }; - "portfinder-1.0.32" = { - name = "portfinder"; - packageName = "portfinder"; - version = "1.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz"; - sha512 = "on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg=="; - }; - }; - "postcss-7.0.39" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"; - sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; - }; - }; - "postcss-8.4.16" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.16"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; - sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; - }; - }; - "postcss-calc-8.2.4" = { - name = "postcss-calc"; - packageName = "postcss-calc"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; - sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; - }; - }; - "postcss-colormin-5.3.0" = { - name = "postcss-colormin"; - packageName = "postcss-colormin"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; - sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; - }; - }; - "postcss-convert-values-5.1.2" = { - name = "postcss-convert-values"; - packageName = "postcss-convert-values"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz"; - sha512 = "c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g=="; - }; - }; - "postcss-discard-comments-5.1.2" = { - name = "postcss-discard-comments"; - packageName = "postcss-discard-comments"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"; - sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="; - }; - }; - "postcss-discard-duplicates-5.1.0" = { - name = "postcss-discard-duplicates"; - packageName = "postcss-discard-duplicates"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; - sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; - }; - }; - "postcss-discard-empty-5.1.1" = { - name = "postcss-discard-empty"; - packageName = "postcss-discard-empty"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; - sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; - }; - }; - "postcss-discard-overridden-5.1.0" = { - name = "postcss-discard-overridden"; - packageName = "postcss-discard-overridden"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; - sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; - }; - }; - "postcss-loader-6.2.1" = { - name = "postcss-loader"; - packageName = "postcss-loader"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz"; - sha512 = "WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q=="; - }; - }; - "postcss-merge-longhand-5.1.6" = { - name = "postcss-merge-longhand"; - packageName = "postcss-merge-longhand"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz"; - sha512 = "6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw=="; - }; - }; - "postcss-merge-rules-5.1.2" = { - name = "postcss-merge-rules"; - packageName = "postcss-merge-rules"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz"; - sha512 = "zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ=="; - }; - }; - "postcss-minify-font-values-5.1.0" = { - name = "postcss-minify-font-values"; - packageName = "postcss-minify-font-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; - sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; - }; - }; - "postcss-minify-gradients-5.1.1" = { - name = "postcss-minify-gradients"; - packageName = "postcss-minify-gradients"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"; - sha512 = "VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="; - }; - }; - "postcss-minify-params-5.1.3" = { - name = "postcss-minify-params"; - packageName = "postcss-minify-params"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz"; - sha512 = "bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg=="; - }; - }; - "postcss-minify-selectors-5.2.1" = { - name = "postcss-minify-selectors"; - packageName = "postcss-minify-selectors"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"; - sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; - }; - }; - "postcss-modules-extract-imports-3.0.0" = { - name = "postcss-modules-extract-imports"; - packageName = "postcss-modules-extract-imports"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; - sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; - }; - }; - "postcss-modules-local-by-default-4.0.0" = { - name = "postcss-modules-local-by-default"; - packageName = "postcss-modules-local-by-default"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; - sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; - }; - }; - "postcss-modules-scope-3.0.0" = { - name = "postcss-modules-scope"; - packageName = "postcss-modules-scope"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; - sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; - }; - }; - "postcss-modules-values-4.0.0" = { - name = "postcss-modules-values"; - packageName = "postcss-modules-values"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; - sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; - }; - }; - "postcss-normalize-charset-5.1.0" = { - name = "postcss-normalize-charset"; - packageName = "postcss-normalize-charset"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; - sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; - }; - }; - "postcss-normalize-display-values-5.1.0" = { - name = "postcss-normalize-display-values"; - packageName = "postcss-normalize-display-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; - sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; - }; - }; - "postcss-normalize-positions-5.1.1" = { - name = "postcss-normalize-positions"; - packageName = "postcss-normalize-positions"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"; - sha512 = "6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg=="; - }; - }; - "postcss-normalize-repeat-style-5.1.1" = { - name = "postcss-normalize-repeat-style"; - packageName = "postcss-normalize-repeat-style"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"; - sha512 = "mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g=="; - }; - }; - "postcss-normalize-string-5.1.0" = { - name = "postcss-normalize-string"; - packageName = "postcss-normalize-string"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; - sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; - }; - }; - "postcss-normalize-timing-functions-5.1.0" = { - name = "postcss-normalize-timing-functions"; - packageName = "postcss-normalize-timing-functions"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; - sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; - }; - }; - "postcss-normalize-unicode-5.1.0" = { - name = "postcss-normalize-unicode"; - packageName = "postcss-normalize-unicode"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; - sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; - }; - }; - "postcss-normalize-url-5.1.0" = { - name = "postcss-normalize-url"; - packageName = "postcss-normalize-url"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; - sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; - }; - }; - "postcss-normalize-whitespace-5.1.1" = { - name = "postcss-normalize-whitespace"; - packageName = "postcss-normalize-whitespace"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; - sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; - }; - }; - "postcss-ordered-values-5.1.3" = { - name = "postcss-ordered-values"; - packageName = "postcss-ordered-values"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"; - sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="; - }; - }; - "postcss-reduce-initial-5.1.0" = { - name = "postcss-reduce-initial"; - packageName = "postcss-reduce-initial"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; - sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; - }; - }; - "postcss-reduce-transforms-5.1.0" = { - name = "postcss-reduce-transforms"; - packageName = "postcss-reduce-transforms"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; - sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; - }; - }; - "postcss-selector-parser-6.0.10" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; - sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; - }; - }; - "postcss-svgo-5.1.0" = { - name = "postcss-svgo"; - packageName = "postcss-svgo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; - sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; - }; - }; - "postcss-unique-selectors-5.1.1" = { - name = "postcss-unique-selectors"; - packageName = "postcss-unique-selectors"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; - sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; - }; - }; - "postcss-value-parser-4.2.0" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - }; - "prelude-ls-1.2.1" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - }; - "prettier-2.7.1" = { - name = "prettier"; - packageName = "prettier"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; - }; - }; - "pretty-error-4.0.0" = { - name = "pretty-error"; - packageName = "pretty-error"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz"; - sha512 = "AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "progress-webpack-plugin-1.0.16" = { - name = "progress-webpack-plugin"; - packageName = "progress-webpack-plugin"; - version = "1.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz"; - sha512 = "sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; - }; - }; - "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-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "qs-6.10.3" = { - name = "qs"; - packageName = "qs"; - version = "6.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; - }; - }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - }; - "randombytes-2.1.0" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; - "read-pkg-5.2.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; - sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; - }; - }; - "read-pkg-up-7.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; - }; - }; - "readable-stream-2.3.7" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - }; - "readable-stream-3.6.0" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - }; - "readdirp-3.6.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; - sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; - }; - }; - "regenerate-1.4.2" = { - name = "regenerate"; - packageName = "regenerate"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - }; - "regenerate-unicode-properties-10.1.0" = { - name = "regenerate-unicode-properties"; - packageName = "regenerate-unicode-properties"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"; - sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="; - }; - }; - "regenerator-runtime-0.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - }; - "regenerator-transform-0.15.0" = { - name = "regenerator-transform"; - packageName = "regenerator-transform"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; - sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; - }; - }; - "regexp.prototype.flags-1.4.3" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - }; - "regexpp-3.2.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - }; - "regexpu-core-5.2.1" = { - name = "regexpu-core"; - packageName = "regexpu-core"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz"; - sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; - }; - }; - "regjsgen-0.7.1" = { - name = "regjsgen"; - packageName = "regjsgen"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"; - sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="; - }; - }; - "regjsparser-0.9.1" = { - name = "regjsparser"; - packageName = "regjsparser"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"; - sha512 = "dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ=="; - }; - }; - "relateurl-0.2.7" = { - name = "relateurl"; - packageName = "relateurl"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; - }; - }; - "renderkid-3.0.0" = { - name = "renderkid"; - packageName = "renderkid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz"; - sha512 = "q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg=="; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "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=="; - }; - }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - }; - "resolve-1.22.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; - }; - }; - "restore-cursor-3.1.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - }; - "retry-0.13.1" = { - name = "retry"; - packageName = "retry"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; - sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; - }; - }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; - "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=="; - }; - }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - 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"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "sass-1.54.0" = { - name = "sass"; - packageName = "sass"; - version = "1.54.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.54.0.tgz"; - sha512 = "C4zp79GCXZfK0yoHZg+GxF818/aclhp9F48XBu/+bm9vXEVAYov9iU3FBVRMq3Hx3OA4jfKL+p2K9180mEh0xQ=="; - }; - }; - "sass-loader-13.0.2" = { - name = "sass-loader"; - packageName = "sass-loader"; - version = "13.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz"; - sha512 = "BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q=="; - }; - }; - "schema-utils-2.7.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; - sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; - }; - }; - "schema-utils-2.7.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; - }; - }; - "schema-utils-3.1.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; - sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; - }; - }; - "schema-utils-4.0.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz"; - sha512 = "1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg=="; - }; - }; - "select-hose-2.0.0" = { - name = "select-hose"; - packageName = "select-hose"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; - sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; - }; - }; - "selfsigned-2.1.1" = { - name = "selfsigned"; - packageName = "selfsigned"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"; - sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; - }; - }; - "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" = { - name = "semver"; - packageName = "semver"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - }; - "semver-7.3.7" = { - name = "semver"; - packageName = "semver"; - version = "7.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; - }; - }; - "send-0.18.0" = { - name = "send"; - packageName = "send"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; - }; - }; - "serialize-javascript-6.0.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; - }; - }; - "serve-index-1.9.1" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="; - }; - }; - "serve-static-1.15.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "shallow-clone-3.0.1" = { - name = "shallow-clone"; - packageName = "shallow-clone"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"; - sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; - }; - }; - "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"; - sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "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"; - sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "shell-quote-1.7.3" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"; - sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "sirv-1.0.19" = { - name = "sirv"; - packageName = "sirv"; - version = "1.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz"; - sha512 = "JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ=="; - }; - }; - "slash-3.0.0" = { - name = "slash"; - packageName = "slash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - }; - "sockjs-0.3.24" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.24"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"; - sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "source-map-js-1.0.2" = { - name = "source-map-js"; - packageName = "source-map-js"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; - }; - }; - "source-map-support-0.5.21" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.21"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - }; - "sourcemap-codec-1.4.8" = { - name = "sourcemap-codec"; - packageName = "sourcemap-codec"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - }; - "spdx-correct-3.1.1" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; - }; - }; - "spdx-exceptions-2.3.0" = { - name = "spdx-exceptions"; - packageName = "spdx-exceptions"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; - }; - }; - "spdx-expression-parse-3.0.1" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; - }; - }; - "spdx-license-ids-3.0.12" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "3.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; - sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; - }; - }; - "spdy-4.0.2" = { - name = "spdy"; - packageName = "spdy"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; - sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; - }; - }; - "spdy-transport-3.0.0" = { - name = "spdy-transport"; - packageName = "spdy-transport"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; - }; - }; - "ssri-8.0.1" = { - name = "ssri"; - packageName = "ssri"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; - }; - }; - "stable-0.1.8" = { - name = "stable"; - packageName = "stable"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; - }; - }; - "stackframe-1.3.4" = { - name = "stackframe"; - packageName = "stackframe"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"; - sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; - }; - }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - }; - "statuses-2.0.1" = { - name = "statuses"; - packageName = "statuses"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.trimend-1.0.5" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - }; - "string.prototype.trimstart-1.0.5" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - 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-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - }; - "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"; - sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; - }; - }; - "strip-final-newline-2.0.0" = { - name = "strip-final-newline"; - packageName = "strip-final-newline"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; - }; - }; - "strip-indent-2.0.0" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; - sha512 = "RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="; - }; - }; - "strip-json-comments-3.1.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - }; - "stylehacks-5.1.0" = { - name = "stylehacks"; - packageName = "stylehacks"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; - sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; - }; - }; - "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 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - 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-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "svg-tags-1.0.0" = { - name = "svg-tags"; - packageName = "svg-tags"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"; - sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; - }; - }; - "svgo-2.8.0" = { - name = "svgo"; - packageName = "svgo"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; - sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; - }; - }; - "tapable-1.1.3" = { - name = "tapable"; - packageName = "tapable"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; - sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; - }; - }; - "tapable-2.2.1" = { - name = "tapable"; - packageName = "tapable"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"; - sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; - }; - }; - "terser-5.15.0" = { - name = "terser"; - packageName = "terser"; - version = "5.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz"; - sha512 = "L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA=="; - }; - }; - "terser-webpack-plugin-5.3.6" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "5.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; - sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "thenify-3.3.1" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; - }; - }; - "thread-loader-3.0.4" = { - name = "thread-loader"; - packageName = "thread-loader"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.4.tgz"; - sha512 = "ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA=="; - }; - }; - "thunky-1.1.0" = { - name = "thunky"; - packageName = "thunky"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; - sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; - }; - }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "totalist-1.1.0" = { - name = "totalist"; - packageName = "totalist"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"; - sha512 = "gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - }; - "ts-loader-9.3.1" = { - name = "ts-loader"; - packageName = "ts-loader"; - version = "9.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.1.tgz"; - sha512 = "OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw=="; - }; - }; - "tsconfig-paths-3.14.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - }; - "tslib-1.14.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - }; - "tslib-2.4.0" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - }; - "tsutils-3.21.0" = { - name = "tsutils"; - packageName = "tsutils"; - version = "3.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - }; - "type-check-0.4.0" = { - name = "type-check"; - packageName = "type-check"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "type-fest-0.6.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; - sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; - }; - }; - "type-fest-0.8.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "typescript-4.7.4" = { - name = "typescript"; - packageName = "typescript"; - version = "4.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"; - sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; - }; - }; - "un-eval-1.2.0" = { - name = "un-eval"; - packageName = "un-eval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/un-eval/-/un-eval-1.2.0.tgz"; - sha512 = "Wlj/pum6dQtGTPD/lclDtoVPkSfpjPfy1dwnnKw/sZP5DpBH9fLhBgQfsqNhe5/gS1D+vkZUuB771NRMUPA5CA=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { - name = "unicode-canonical-property-names-ecmascript"; - packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; - }; - }; - "unicode-match-property-ecmascript-2.0.0" = { - name = "unicode-match-property-ecmascript"; - packageName = "unicode-match-property-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; - sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; - }; - }; - "unicode-match-property-value-ecmascript-2.0.0" = { - name = "unicode-match-property-value-ecmascript"; - packageName = "unicode-match-property-value-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; - sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; - }; - }; - "unicode-property-aliases-ecmascript-2.1.0" = { - name = "unicode-property-aliases-ecmascript"; - packageName = "unicode-property-aliases-ecmascript"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"; - sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "update-browserslist-db-1.0.9" = { - name = "update-browserslist-db"; - packageName = "update-browserslist-db"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz"; - sha512 = "/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg=="; - }; - }; - "uri-js-4.4.1" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "utila-0.4.0" = { - name = "utila"; - packageName = "utila"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; - sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "v-lazy-image-2.1.1" = { - name = "v-lazy-image"; - packageName = "v-lazy-image"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v-lazy-image/-/v-lazy-image-2.1.1.tgz"; - sha512 = "QC6Jcok99CRhhsO7svfI3hcBaT945dSuaHk3jr7WHm+QJMzbB/f32xKkdF45qL5ezd5KeoqHKh4gD92mQtjfXQ=="; - }; - }; - "v8-compile-cache-2.3.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - }; - "validate-npm-package-license-3.0.4" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "vue-3.2.37" = { - name = "vue"; - packageName = "vue"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz"; - sha512 = "bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ=="; - }; - }; - "vue-cli-plugin-pinia-0.1.4" = { - name = "vue-cli-plugin-pinia"; - packageName = "vue-cli-plugin-pinia"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-pinia/-/vue-cli-plugin-pinia-0.1.4.tgz"; - sha512 = "YZy0Zhsgpl5MLoe6hJwNdsuaxW7xYc4jZyohS3ZzWpibCXNdxbr1INOJpLpLeE1ai9VoPXXHvooPxUZs+hHEDg=="; - }; - }; - "vue-demi-0.13.11" = { - name = "vue-demi"; - packageName = "vue-demi"; - version = "0.13.11"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"; - sha512 = "IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="; - }; - }; - "vue-dragscroll-4.0.4" = { - name = "vue-dragscroll"; - packageName = "vue-dragscroll"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-dragscroll/-/vue-dragscroll-4.0.4.tgz"; - sha512 = "2VaDPzvVJKR0FxOwIt9ot53tpVG3K6Qcb7LFOHQ869WVBXWuVcJTXyBRKyrUACY82O3kIdPvj/Kzsw4ZeBkL0w=="; - }; - }; - "vue-eslint-parser-9.1.0" = { - name = "vue-eslint-parser"; - packageName = "vue-eslint-parser"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz"; - sha512 = "NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ=="; - }; - }; - "vue-hot-reload-api-2.3.4" = { - name = "vue-hot-reload-api"; - packageName = "vue-hot-reload-api"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; - sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; - }; - }; - "vue-i18n-9.1.10" = { - name = "vue-i18n"; - packageName = "vue-i18n"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.10.tgz"; - sha512 = "jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g=="; - }; - }; - "vue-loader-17.0.0" = { - name = "vue-loader"; - packageName = "vue-loader"; - version = "17.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.0.tgz"; - sha512 = "OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg=="; - }; - }; - "vue-router-4.1.5" = { - name = "vue-router"; - packageName = "vue-router"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-4.1.5.tgz"; - sha512 = "IsvoF5D2GQ/EGTs/Th4NQms9gd2NSqV+yylxIyp/OYp8xOwxmU8Kj/74E9DTSYAyH5LX7idVUngN3JSj1X4xcQ=="; - }; - }; - "vue-style-loader-4.1.3" = { - name = "vue-style-loader"; - packageName = "vue-style-loader"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; - sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; - }; - }; - "vue-template-es2015-compiler-1.9.1" = { - name = "vue-template-es2015-compiler"; - packageName = "vue-template-es2015-compiler"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; - sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; - }; - }; - "watchpack-2.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"; - sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; - }; - }; - "wbuf-1.7.3" = { - name = "wbuf"; - packageName = "wbuf"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; - }; - }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; - }; - }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - }; - "webpack-5.74.0" = { - name = "webpack"; - packageName = "webpack"; - version = "5.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; - }; - }; - "webpack-bundle-analyzer-4.6.1" = { - name = "webpack-bundle-analyzer"; - packageName = "webpack-bundle-analyzer"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz"; - sha512 = "oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw=="; - }; - }; - "webpack-chain-6.5.1" = { - name = "webpack-chain"; - packageName = "webpack-chain"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz"; - sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; - }; - }; - "webpack-dev-middleware-5.3.3" = { - name = "webpack-dev-middleware"; - packageName = "webpack-dev-middleware"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"; - sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; - }; - }; - "webpack-dev-server-4.11.0" = { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "4.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.0.tgz"; - sha512 = "L5S4Q2zT57SK7tazgzjMiSMBdsw+rGYIX27MgPgx7LDhWO0lViPrHKoLS7jo5In06PWYAhlYu3PbyoC6yAThbw=="; - }; - }; - "webpack-merge-5.8.0" = { - name = "webpack-merge"; - packageName = "webpack-merge"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"; - sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; - }; - }; - "webpack-sources-3.2.3" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"; - sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; - }; - }; - "webpack-virtual-modules-0.4.5" = { - name = "webpack-virtual-modules"; - packageName = "webpack-virtual-modules"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.5.tgz"; - sha512 = "8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg=="; - }; - }; - "websocket-driver-0.7.4" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"; - sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; - }; - }; - "websocket-extensions-0.1.4" = { - name = "websocket-extensions"; - packageName = "websocket-extensions"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; - sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; - }; - }; - "whatwg-fetch-3.6.2" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - }; - "which-1.3.1" = { - name = "which"; - packageName = "which"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "which-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "wildcard-2.0.0" = { - name = "wildcard"; - packageName = "wildcard"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"; - sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; - }; - }; - "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 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha512 = "iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ=="; - }; - }; - "wrap-ansi-7.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "ws-7.5.9" = { - name = "ws"; - packageName = "ws"; - version = "7.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; - }; - }; - "ws-8.8.1" = { - name = "ws"; - packageName = "ws"; - version = "8.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"; - sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; - }; - }; - "xml-name-validator-4.0.0" = { - name = "xml-name-validator"; - packageName = "xml-name-validator"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; - sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; - }; - }; - "y18n-5.0.8" = { - name = "y18n"; - packageName = "y18n"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; - }; - }; - "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.2" = { - name = "yaml"; - packageName = "yaml"; - version = "1.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yorkie-2.0.0" = { - name = "yorkie"; - packageName = "yorkie"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; - sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; - }; - }; - }; - args = { - name = "ldgallery-viewer"; - packageName = "ldgallery-viewer"; - version = "2.1.0"; - src = ./.; - dependencies = [ - sources."@achrinza/node-ipc-9.2.5" - sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.1" - (sources."@babel/core-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/generator-7.19.0" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.19.0" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" - (sources."@babel/helper-define-polyfill-provider-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.19.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" - sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.19.0" - sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.1" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.19.1" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" - sources."@babel/plugin-proposal-decorators-7.19.1" - sources."@babel/plugin-proposal-dynamic-import-7.18.6" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" - sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.19.0" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.18.6" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.18.6" - 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-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" - sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" - sources."@babel/plugin-transform-classes-7.19.0" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" - sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.9" - sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-for-of-7.18.8" - sources."@babel/plugin-transform-function-name-7.18.9" - sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.18.6" - sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.0" - sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" - sources."@babel/plugin-transform-new-target-7.18.6" - sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.18.8" - sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-regenerator-7.18.6" - sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" - sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.9" - sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-unicode-escapes-7.18.10" - sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.19.0" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.1" - sources."@babel/types-7.19.0" - (sources."@eslint/eslintrc-1.3.2" // { - dependencies = [ - sources."globals-13.17.0" - sources."type-fest-0.20.2" - ]; - }) - sources."@fortawesome/fontawesome-common-types-6.1.2" - sources."@fortawesome/fontawesome-svg-core-6.1.2" - sources."@fortawesome/free-solid-svg-icons-6.1.2" - sources."@fortawesome/vue-fontawesome-3.0.1" - sources."@hapi/hoek-9.3.0" - sources."@hapi/topo-5.1.0" - sources."@humanwhocodes/config-array-0.9.5" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@intlify/core-base-9.1.10" - sources."@intlify/devtools-if-9.1.10" - sources."@intlify/message-compiler-9.1.10" - sources."@intlify/message-resolver-9.1.10" - sources."@intlify/runtime-9.1.10" - sources."@intlify/shared-9.1.10" - sources."@intlify/vue-devtools-9.1.10" - sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - (sources."@jridgewell/source-map-0.3.2" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" - sources."@leichtgewicht/ip-codec-2.0.4" - sources."@node-ipc/js-queue-2.0.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@polka/url-1.0.0-next.21" - sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" - sources."@sideway/pinpoint-2.0.0" - (sources."@soda/friendly-errors-webpack-plugin-1.8.1" // { - 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."@soda/get-current-script-1.0.2" - sources."@trysound/sax-0.2.0" - sources."@types/body-parser-1.19.2" - sources."@types/bonjour-3.5.10" - sources."@types/connect-3.4.35" - sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.4.6" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-0.0.51" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" - sources."@types/hammerjs-2.0.41" - sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-proxy-1.17.9" - sources."@types/json-schema-7.0.11" - sources."@types/json5-0.0.29" - sources."@types/marked-4.0.6" - sources."@types/mime-3.0.1" - sources."@types/minimist-1.2.2" - sources."@types/node-18.7.18" - sources."@types/normalize-package-data-2.4.1" - sources."@types/parse-json-4.0.0" - sources."@types/qs-6.9.7" - sources."@types/range-parser-1.2.4" - sources."@types/retry-0.12.0" - sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.0" - sources."@types/sockjs-0.3.33" - sources."@types/web-bluetooth-0.0.15" - sources."@types/webpack-env-1.18.0" - sources."@types/ws-8.5.3" - sources."@typescript-eslint/eslint-plugin-5.31.0" - sources."@typescript-eslint/parser-5.31.0" - sources."@typescript-eslint/scope-manager-5.31.0" - sources."@typescript-eslint/type-utils-5.31.0" - sources."@typescript-eslint/types-5.31.0" - sources."@typescript-eslint/typescript-estree-5.31.0" - sources."@typescript-eslint/utils-5.31.0" - sources."@typescript-eslint/visitor-keys-5.31.0" - sources."@vue/babel-helper-vue-jsx-merge-props-1.4.0" - sources."@vue/babel-helper-vue-transform-on-1.0.2" - sources."@vue/babel-plugin-jsx-1.1.1" - (sources."@vue/babel-plugin-transform-vue-jsx-1.4.0" // { - dependencies = [ - sources."html-tags-2.0.0" - ]; - }) - sources."@vue/babel-preset-app-5.0.8" - sources."@vue/babel-preset-jsx-1.4.0" - sources."@vue/babel-sugar-composition-api-inject-h-1.4.0" - sources."@vue/babel-sugar-composition-api-render-instance-1.4.0" - sources."@vue/babel-sugar-functional-vue-1.4.0" - sources."@vue/babel-sugar-inject-h-1.4.0" - (sources."@vue/babel-sugar-v-model-1.4.0" // { - dependencies = [ - sources."camelcase-5.3.1" - sources."html-tags-2.0.0" - ]; - }) - (sources."@vue/babel-sugar-v-on-1.4.0" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) - sources."@vue/cli-overlay-5.0.8" - sources."@vue/cli-plugin-babel-5.0.8" - sources."@vue/cli-plugin-eslint-5.0.8" - sources."@vue/cli-plugin-router-5.0.8" - sources."@vue/cli-plugin-typescript-5.0.8" - sources."@vue/cli-plugin-vuex-5.0.8" - sources."@vue/cli-service-5.0.8" - (sources."@vue/cli-shared-utils-5.0.8" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - 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."@vue/compiler-core-3.2.37" - sources."@vue/compiler-dom-3.2.37" - sources."@vue/compiler-sfc-3.2.37" - sources."@vue/compiler-ssr-3.2.37" - (sources."@vue/component-compiler-utils-3.3.0" // { - dependencies = [ - sources."hash-sum-1.0.2" - sources."lru-cache-4.1.5" - sources."picocolors-0.2.1" - sources."postcss-7.0.39" - sources."yallist-2.1.2" - ]; - }) - sources."@vue/devtools-api-6.2.1" - sources."@vue/eslint-config-standard-8.0.0" - sources."@vue/eslint-config-typescript-11.0.0" - sources."@vue/reactivity-3.2.37" - sources."@vue/reactivity-transform-3.2.37" - sources."@vue/runtime-core-3.2.37" - sources."@vue/runtime-dom-3.2.37" - sources."@vue/server-renderer-3.2.37" - sources."@vue/shared-3.2.37" - (sources."@vue/vue-loader-v15-15.10.0" // { - dependencies = [ - sources."hash-sum-1.0.2" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."@vue/web-component-wrapper-1.3.0" - sources."@vueuse/core-9.1.1" - sources."@vueuse/metadata-9.1.1" - sources."@vueuse/shared-9.1.1" - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-buffer-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/helper-wasm-section-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/wasm-edit-1.11.1" - sources."@webassemblyjs/wasm-gen-1.11.1" - sources."@webassemblyjs/wasm-opt-1.11.1" - sources."@webassemblyjs/wasm-parser-1.11.1" - sources."@webassemblyjs/wast-printer-1.11.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."accepts-1.3.8" - sources."acorn-8.8.0" - sources."acorn-import-assertions-1.8.0" - sources."acorn-jsx-5.3.2" - sources."acorn-walk-8.2.0" - sources."address-1.2.1" - sources."ajv-6.12.6" - (sources."ajv-formats-2.1.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."ajv-keywords-3.5.2" - sources."ansi-escapes-3.2.0" - sources."ansi-html-community-0.0.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.2" - sources."arch-2.2.0" - sources."argparse-2.0.1" - sources."array-flatten-2.1.2" - sources."array-includes-3.1.5" - sources."array-union-2.1.0" - sources."array.prototype.flat-1.3.0" - sources."async-2.6.4" - sources."at-least-node-1.0.0" - sources."autoprefixer-10.4.11" - sources."babel-loader-8.2.5" - sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.6.0" - sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."batch-0.6.1" - sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" - sources."bl-4.1.0" - sources."bluebird-3.7.2" - (sources."body-parser-1.20.0" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."bonjour-service-1.0.14" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browserslist-4.21.4" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."builtins-5.0.1" - sources."bytes-3.0.0" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."camelcase-6.3.0" - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001402" - sources."case-sensitive-paths-webpack-plugin-2.4.0" - sources."chalk-2.4.2" - sources."chokidar-3.5.3" - sources."chrome-trace-event-1.0.3" - sources."ci-info-1.6.0" - sources."clean-css-5.3.1" - sources."cli-cursor-3.1.0" - (sources."cli-highlight-2.1.11" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - 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."cli-spinners-2.7.0" - sources."clipboardy-2.3.0" - sources."cliui-7.0.4" - sources."clone-1.0.4" - sources."clone-deep-4.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colord-2.9.3" - sources."colorette-2.0.19" - sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."concat-map-0.0.1" - sources."connect-history-api-fallback-2.0.0" - sources."consolidate-0.15.1" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.4" - sources."convert-source-map-1.8.0" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - (sources."copy-webpack-plugin-9.1.0" // { - dependencies = [ - sources."glob-parent-6.0.2" - sources."schema-utils-3.1.1" - ]; - }) - sources."core-js-3.25.0" - sources."core-js-compat-3.25.1" - sources."core-util-is-1.0.3" - sources."cosmiconfig-6.0.0" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."css-declaration-sorter-6.3.1" - sources."css-loader-6.7.1" - (sources."css-minimizer-webpack-plugin-3.4.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - sources."css-select-4.3.0" - sources."css-tree-1.1.3" - sources."css-what-6.1.0" - sources."cssesc-3.0.0" - sources."cssnano-5.1.13" - sources."cssnano-preset-default-5.2.12" - sources."cssnano-utils-3.1.0" - sources."csso-4.2.0" - sources."csstype-2.6.21" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" - (sources."default-gateway-6.0.3" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."defaults-1.0.3" - sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-node-2.1.0" - sources."dir-glob-3.0.1" - sources."dns-equal-1.0.0" - sources."dns-packet-5.4.0" - sources."doctrine-3.0.0" - sources."dom-converter-0.2.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."dotenv-10.0.0" - sources."dotenv-expand-5.1.0" - sources."duplexer-0.1.2" - sources."easy-stack-1.0.1" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.254" - 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-5.10.0" - sources."entities-2.2.0" - sources."error-ex-1.3.2" - sources."error-stack-parser-2.1.4" - sources."es-abstract-1.20.2" - sources."es-module-lexer-0.9.3" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - (sources."eslint-8.20.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.1" - sources."estraverse-5.3.0" - sources."glob-parent-6.0.2" - sources."globals-13.17.0" - sources."has-flag-4.0.0" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.20.2" - sources."which-2.0.2" - ]; - }) - sources."eslint-config-standard-17.0.0" - sources."eslint-import-resolver-custom-alias-1.3.0" - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.7.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-plugin-es-4.1.0" // { - dependencies = [ - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - ]; - }) - (sources."eslint-plugin-import-2.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."doctrine-2.1.0" - sources."ms-2.0.0" - ]; - }) - sources."eslint-plugin-n-15.2.5" - (sources."eslint-plugin-node-11.1.0" // { - dependencies = [ - sources."eslint-plugin-es-3.0.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."semver-6.3.0" - ]; - }) - sources."eslint-plugin-promise-6.0.0" - sources."eslint-plugin-vue-9.3.0" - sources."eslint-scope-5.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - (sources."eslint-webpack-plugin-3.2.0" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."has-flag-4.0.0" - sources."jest-worker-28.1.3" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."espree-9.4.0" - sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."estree-walker-2.0.2" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-pubsub-4.3.0" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."execa-1.0.0" - (sources."express-4.18.1" // { - dependencies = [ - sources."array-flatten-1.1.1" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" - sources."faye-websocket-0.11.4" - sources."figures-2.0.0" - sources."file-entry-cache-6.0.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."follow-redirects-1.15.2" - (sources."fork-ts-checker-webpack-plugin-6.5.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."schema-utils-2.7.0" - sources."supports-color-7.2.0" - sources."tapable-1.1.3" - ]; - }) - sources."forwarded-0.2.0" - sources."fraction.js-4.2.0" - sources."fresh-0.5.2" - sources."fs-extra-9.1.0" - sources."fs-monkey-1.0.3" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functional-red-black-tree-1.0.1" - sources."functions-have-names-1.2.3" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."globals-11.12.0" - sources."globby-11.1.0" - sources."graceful-fs-4.2.10" - sources."gzip-size-6.0.0" - sources."hammerjs-2.0.8" - sources."handle-thing-2.0.1" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hash-sum-2.0.0" - sources."he-1.2.0" - sources."highlight.js-10.7.3" - sources."hosted-git-info-2.8.9" - (sources."hpack.js-2.1.6" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."html-entities-2.3.3" - (sources."html-minifier-terser-6.1.0" // { - dependencies = [ - sources."commander-8.3.0" - ]; - }) - sources."html-tags-3.2.0" - sources."html-webpack-plugin-5.5.0" - sources."htmlparser2-6.1.0" - sources."http-deceiver-1.2.7" - sources."http-errors-2.0.0" - sources."http-parser-js-0.5.8" - sources."http-proxy-1.18.1" - sources."http-proxy-middleware-2.0.6" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."icss-utils-5.1.0" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - sources."immutable-4.1.0" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.3" - sources."ipaddr.js-2.0.1" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.6" - sources."is-ci-1.2.1" - sources."is-core-module-2.10.0" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-file-esm-1.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-negative-zero-2.0.2" - sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-plain-obj-3.0.0" - sources."is-plain-object-2.0.4" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-stream-1.1.0" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-unicode-supported-0.1.0" - sources."is-weakref-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."javascript-stringify-2.1.0" - (sources."jest-worker-27.5.1" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."joi-17.6.0" - sources."js-message-1.0.7" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - (sources."js-yaml-loader-1.2.2" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.1" - sources."jsonfile-6.1.0" - sources."kind-of-6.0.3" - sources."klona-2.0.5" - sources."launch-editor-2.6.0" - sources."launch-editor-middleware-2.6.0" - sources."levn-0.4.1" - sources."lilconfig-2.0.6" - sources."lines-and-columns-1.2.4" - sources."loader-runner-4.3.0" - sources."loader-utils-2.0.2" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.defaultsdeep-4.6.1" - sources."lodash.kebabcase-4.1.1" - sources."lodash.mapvalues-4.6.0" - sources."lodash.memoize-4.1.2" - sources."lodash.merge-4.6.2" - sources."lodash.uniq-4.5.0" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - 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."log-update-2.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."cli-cursor-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."lru-cache-6.0.0" - sources."magic-string-0.25.9" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."marked-4.0.19" - sources."mdn-data-2.0.14" - sources."media-typer-0.3.0" - sources."memfs-3.4.7" - sources."merge-descriptors-1.0.1" - sources."merge-source-map-1.1.0" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - (sources."mini-css-extract-plugin-2.6.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.6" - sources."minipass-3.3.5" - sources."mkdirp-0.5.6" - sources."module-alias-2.2.2" - sources."mosha-vue-toastify-1.0.23" - sources."mrmime-1.0.1" - sources."ms-2.1.2" - sources."multicast-dns-7.2.5" - sources."mz-2.7.0" - sources."nanoid-3.3.4" - sources."natural-compare-1.4.0" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."node-fetch-2.6.7" - sources."node-forge-1.3.1" - sources."node-releases-2.0.6" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."normalize-path-3.0.0" - sources."normalize-range-0.1.2" - sources."normalize-url-6.1.0" - sources."npm-run-path-2.0.2" - sources."nth-check-2.1.1" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."object.values-1.1.5" - sources."obuf-1.1.2" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.0" - sources."opener-1.5.2" - sources."optionator-0.9.1" - (sources."ora-5.4.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - 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."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-retry-4.6.2" - sources."p-try-2.2.0" - (sources."param-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parse5-5.1.1" - (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { - dependencies = [ - sources."parse5-6.0.1" - ]; - }) - sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pinia-2.0.21" - sources."pkg-dir-4.2.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."postcss-8.4.16" - sources."postcss-calc-8.2.4" - sources."postcss-colormin-5.3.0" - sources."postcss-convert-values-5.1.2" - sources."postcss-discard-comments-5.1.2" - sources."postcss-discard-duplicates-5.1.0" - sources."postcss-discard-empty-5.1.1" - sources."postcss-discard-overridden-5.1.0" - (sources."postcss-loader-6.2.1" // { - dependencies = [ - sources."cosmiconfig-7.0.1" - ]; - }) - sources."postcss-merge-longhand-5.1.6" - sources."postcss-merge-rules-5.1.2" - sources."postcss-minify-font-values-5.1.0" - sources."postcss-minify-gradients-5.1.1" - sources."postcss-minify-params-5.1.3" - sources."postcss-minify-selectors-5.2.1" - sources."postcss-modules-extract-imports-3.0.0" - sources."postcss-modules-local-by-default-4.0.0" - sources."postcss-modules-scope-3.0.0" - sources."postcss-modules-values-4.0.0" - sources."postcss-normalize-charset-5.1.0" - sources."postcss-normalize-display-values-5.1.0" - sources."postcss-normalize-positions-5.1.1" - sources."postcss-normalize-repeat-style-5.1.1" - sources."postcss-normalize-string-5.1.0" - sources."postcss-normalize-timing-functions-5.1.0" - sources."postcss-normalize-unicode-5.1.0" - sources."postcss-normalize-url-5.1.0" - sources."postcss-normalize-whitespace-5.1.1" - sources."postcss-ordered-values-5.1.3" - sources."postcss-reduce-initial-5.1.0" - sources."postcss-reduce-transforms-5.1.0" - sources."postcss-selector-parser-6.0.10" - sources."postcss-svgo-5.1.0" - sources."postcss-unique-selectors-5.1.1" - sources."postcss-value-parser-4.2.0" - sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" - sources."pretty-error-4.0.0" - sources."process-nextick-args-2.0.1" - sources."progress-webpack-plugin-1.0.16" - (sources."proxy-addr-2.0.7" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) - sources."pseudomap-1.0.2" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.10.3" - sources."queue-microtask-1.2.3" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - sources."read-pkg-5.2.0" - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."readable-stream-3.6.0" - sources."readdirp-3.6.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.15.0" - sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."regexpu-core-5.2.1" - sources."regjsgen-0.7.1" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."relateurl-0.2.7" - sources."renderkid-3.0.0" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."resolve-1.22.1" - sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" - sources."retry-0.13.1" - 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."sass-1.54.0" - sources."sass-loader-13.0.2" - sources."schema-utils-2.7.1" - sources."select-hose-2.0.0" - sources."selfsigned-2.1.1" - sources."semver-7.3.7" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serialize-javascript-6.0.0" - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."ms-2.0.0" - sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."shallow-clone-3.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.3" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."sirv-1.0.19" - sources."slash-3.0.0" - sources."sockjs-0.3.24" - sources."source-map-0.6.1" - sources."source-map-js-1.0.2" - sources."source-map-support-0.5.21" - 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.12" - sources."spdy-4.0.2" - sources."spdy-transport-3.0.0" - sources."sprintf-js-1.0.3" - sources."ssri-8.0.1" - sources."stable-0.1.8" - sources."stackframe-1.3.4" - sources."statuses-2.0.1" - sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" - (sources."string_decoder-1.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-2.0.0" - sources."strip-json-comments-3.1.1" - sources."stylehacks-5.1.0" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svg-tags-1.0.0" - (sources."svgo-2.8.0" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - sources."tapable-2.2.1" - sources."terser-5.15.0" - (sources."terser-webpack-plugin-5.3.6" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) - sources."text-table-0.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - (sources."thread-loader-3.0.4" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) - sources."thunky-1.1.0" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."totalist-1.1.0" - sources."tr46-0.0.3" - (sources."ts-loader-9.3.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - 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."tsconfig-paths-3.14.1" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) - sources."tslib-1.14.1" - sources."tsutils-3.21.0" - sources."type-check-0.4.0" - sources."type-fest-0.6.0" - sources."type-is-1.6.18" - sources."typescript-4.7.4" - sources."un-eval-1.2.0" - sources."unbox-primitive-1.0.2" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.0.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.9" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."utila-0.4.0" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."v-lazy-image-2.1.1" - sources."v8-compile-cache-2.3.0" - sources."validate-npm-package-license-3.0.4" - sources."vary-1.1.2" - sources."vue-3.2.37" - sources."vue-cli-plugin-pinia-0.1.4" - sources."vue-demi-0.13.11" - sources."vue-dragscroll-4.0.4" - (sources."vue-eslint-parser-9.1.0" // { - dependencies = [ - sources."eslint-scope-7.1.1" - sources."estraverse-5.3.0" - ]; - }) - sources."vue-hot-reload-api-2.3.4" - sources."vue-i18n-9.1.10" - (sources."vue-loader-17.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - 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."vue-router-4.1.5" - (sources."vue-style-loader-4.1.3" // { - dependencies = [ - sources."hash-sum-1.0.2" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."vue-template-es2015-compiler-1.9.1" - sources."watchpack-2.4.0" - sources."wbuf-1.7.3" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - (sources."webpack-5.74.0" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) - (sources."webpack-bundle-analyzer-4.6.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-7.2.0" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."webpack-chain-6.5.1" // { - dependencies = [ - sources."deepmerge-1.5.2" - ]; - }) - (sources."webpack-dev-middleware-5.3.3" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - (sources."webpack-dev-server-4.11.0" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - sources."ws-8.8.1" - ]; - }) - sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.3" - sources."webpack-virtual-modules-0.4.5" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - sources."whatwg-fetch-3.6.2" - sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."wildcard-2.0.0" - sources."word-wrap-1.2.3" - (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."ws-7.5.9" - sources."xml-name-validator-4.0.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yaml-1.10.2" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - (sources."yorkie-2.0.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.8.0" - sources."get-stream-3.0.0" - sources."lru-cache-4.1.5" - sources."normalize-path-1.0.0" - sources."yallist-2.1.2" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - homepage = "https://ldgallery.pacien.org/"; - license = "AGPL-3"; - }; - production = false; - bypassCache = true; - reconstructLock = true; - }; -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/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index d7abf3787e4..20401cd092c 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -3,7 +3,6 @@ , fetchzip , fetchFromGitHub , cmake -, spirv-headers , vulkan-headers , vulkan-loader , glslang diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 03d37280866..11ee723091b 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchCrate , rustPlatform +, fetchCrate }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index d8cb710b293..56fe4e122e5 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,5 +1,6 @@ { cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL -, cudaSupport ? false, cudatoolkit ? null +, config +, cudaSupport ? config.cudaSupport, cudatoolkit ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix b/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix index 6f41f2826b2..29e1d391958 100644 --- a/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix @@ -4,14 +4,12 @@ , freetype , zlib , openssl -, dpkg , fetchurl , gcc-unwrapped , libjpeg8 , libpng , fontconfig , stdenv -, wkhtmltopdf , xar , xorg }: diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 09a5362ae40..299dd0e1385 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { gtk3 gtk4 fmt - gobject-introspection fcitx5 pcre libuuid @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gobject-introspection ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix index dce5bd48592..e58db09f706 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix @@ -1,4 +1,4 @@ -{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit +{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch , python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5 , jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad, nixosTests }: let @@ -24,7 +24,7 @@ let sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw="; }; -in clangStdenv.mkDerivation rec { +in clangStdenv.mkDerivation { pname = "fcitx5-mozc"; version = "2.26.4220.102"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 26a50951c01..0cb7d845ed4 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -5,7 +5,6 @@ , xorg , pkg-config , wrapGAppsHook -, ibus , gtk3 , go }: diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix index afce1acb6d6..2e322d24a7a 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }: +{ lib, stdenv, fetchurl, pkg-config, ibus, gtk3, libthai }: stdenv.mkDerivation rec { pname = "ibus-libthai"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 181bfd5e1fb..89e4d3d15cd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.15"; + version = "1.3.16"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nOj5gwhFodZv29hAN6S8EhQ+XlWp31FDOGIXtyAOM1E="; + hash = "sha256-TybqFQ2EgYo4zCYXwDJ0dke7HSzkZXs0lG2zR2XmlG4="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ibus ibus-table python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ ibus ibus-table ]; preBuild = '' export HOME=$TMPDIR @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/moebiuscurve/ibus-table-others"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ mudri ]; + maintainers = with maintainers; [ mudri McSinyx ]; }; } diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index f902be816ba..848758b5414 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { vala wrapGAppsHook dbus-launch + gobject-introspection ]; propagatedBuildInputs = [ @@ -142,7 +143,6 @@ stdenv.mkDerivation rec { systemd dconf gdk-pixbuf - gobject-introspection python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 092901e08c3..ff2a7363d90 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -1,5 +1,4 @@ { lib -, python3 , pkgconfig , wrapGAppsHook , gettext diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix index ba0c0516443..810ade71bb3 100644 --- a/pkgs/tools/inputmethods/keyd/default.nix +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, cmake -, pkg-config , systemd , runtimeShell , python3 @@ -43,7 +41,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "keyd"; inherit version src; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 73d7353894f..c526f6a844d 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , m17n_db , autoreconfHook , pkg-config diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index bb974fbc8b5..da6074a96a3 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, iconv, skktools }: +{ lib, stdenv, fetchurl, iconv, skktools }: let # kana to kanji diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix new file mode 100644 index 00000000000..b28b7ad784f --- /dev/null +++ b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, _7zz +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "unnaturalscrollwheels"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/ther0n/UnnaturalScrollWheels/releases/download/${finalAttrs.version}/UnnaturalScrollWheels-${finalAttrs.version}.dmg"; + sha256 = "1c6vlf0kc7diz0hb1fmrqaj7kzzfvr65zcchz6xv5cxf0md4n70r"; + }; + sourceRoot = "."; + + # APFS format is unsupported by undmg + nativeBuildInputs = [ _7zz ]; + unpackCmd = "7zz x $curSrc"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Invert scroll direction for physical scroll wheels"; + homepage = "https://github.com/ther0n/UnnaturalScrollWheels"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/tools/misc/a4term/default.nix b/pkgs/tools/misc/a4term/default.nix new file mode 100644 index 00000000000..6c9ab7aac24 --- /dev/null +++ b/pkgs/tools/misc/a4term/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, libtickit +, libvterm-neovim +}: + +stdenv.mkDerivation rec { + pname = "a4term"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "rpmohn"; + repo = "a4"; + rev = "v${version}"; + hash = "sha256-hsAEiPOZBqjvmSZEmZwfDqHZV/8ym62RZPxl3DG4ntQ="; + }; + + buildInputs = [ + libtickit + libvterm-neovim + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A dynamic terminal window manager"; + homepage = "https://www.a4term.com/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onemoresuza ]; + platforms = lib.platforms.linux; + mainProgram = "a4"; + }; +} diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 1a4c9b36fbb..e9da12b3282 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.34.3"; + version = "2.35.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-Cy2mRcx8UZp9+7O824sosQ8ld9ppl2YvCssvL16aBsA="; + hash = "sha256-drydLWt0B7mQKMn1GzEe/I352b2hvhCKV8tUicZoVHk="; }; - vendorHash = "sha256-Z812v+UTaAi3tA2hWtZkQXrtlXhQzlawYtbQdX1HHN0="; + vendorHash = "sha256-HZYYENQIkmAhm0oDfUUpiAqWTbmNsy6u6hOyUvd8iC8="; doCheck = false; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index e8bbb9540a1..e6efabb5b33 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ pythonEnv gtk3 libwnck wrapGAppsHook ]; installPhase = '' sed -i 's/python/python3/g' clipster diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 49dc167a09f..1b33f15ce20 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,29 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.31.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "cloudsql-proxy"; + repo = "cloud-sql-proxy"; rev = "v${version}"; - sha256 = "sha256-wlMwl1S9WKtCoruKhMVK1197/3/OWhvvXTT1tH/yPlI="; + hash = "sha256-/mXaNRTRIBIPUHY/MOHpGmpB8wBp18wwftn/EdmoffQ="; }; - subPackages = [ "cmd/cloud_sql_proxy" ]; + subPackages = [ "." ]; - vendorSha256 = "sha256-OMvu0LCYv0Z03ZM2o8UZx/Su2rdvTJp5DUZa8/MtQSc="; + vendorSha256 = "sha256-VadE9E4B8BIIHGl+PN4oDl0H56xE3GQn0MxGw5fGsvM="; preCheck = '' buildFlagsArray+="-short" ''; meta = with lib; { - description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; + description = "Utility for ensuring secure connections to Google Cloud SQL instances"; + homepage = "https://github.com/GoogleCloudPlatform/cloud-sql-proxy"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski ]; - mainProgram = "cloud_sql_proxy"; + maintainers = with maintainers; [ nicknovitski totoroot ]; + mainProgram = "cloud-sql-proxy"; }; } diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index 60168b2e44f..dc140c1c0c0 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -1,36 +1,35 @@ -{ lib, python3, fetchFromGitHub }: - -let - # csvs-to-sqlite is currently not compatible with Click 8. See the following - # https://github.com/simonw/csvs-to-sqlite/issues/80 - # - # Workaround the issue by providing click 7 explicitly. - python = python3.override { - packageOverrides = self: super: { - # Use click 7 - click = super.click.overridePythonAttrs (old: rec { - version = "7.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - }); - }; - }; -in with python.pkgs; buildPythonApplication rec { +{ lib, python3, fetchFromGitHub, fetchpatch }: + +with python3.pkgs; buildPythonApplication rec { pname = "csvs-to-sqlite"; - version = "1.2"; + version = "1.3"; format = "setuptools"; - disabled = !isPy3k; - src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - hash = "sha256-ZG7Yto8q9QNNJPB/LMwzucLfCGiqwBd3l0ePZs5jKV0"; + hash = "sha256-wV6htULG3lg2IhG2bXmc/9vjcK8/+WA7jm3iJu4ZoOE="; }; + patches = [ + # https://github.com/simonw/csvs-to-sqlite/pull/92 + (fetchpatch { + name = "pandas2-compatibility-1.patch"; + url = "https://github.com/simonw/csvs-to-sqlite/commit/fcd5b9c7485bc7b95bf2ed9507f18a60728e0bcb.patch"; + hash = "sha256-ZmaNWxsqeNw5H5gAih66DLMmzmePD4no1B5mTf8aFvI="; + }) + (fetchpatch { + name = "pandas2-compatibility-2.patch"; + url = "https://github.com/simonw/csvs-to-sqlite/commit/3d190aa44e8d3a66a9a3ca5dc11c6fe46da024df.patch"; + hash = "sha256-uYUH0Mhn6LIf+AHcn6WuCo5zFuSNWOZBM+AoqkmMnSI="; + }) + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ click dateparser @@ -39,15 +38,24 @@ in with python.pkgs; buildPythonApplication rec { six ]; + pythonRelaxDeps = [ + "click" + ]; + nativeCheckInputs = [ + cogapp pytestCheckHook ]; + disabledTests = [ + # Test needs to be adjusted for click >= 8. + "test_if_cog_needs_to_be_run" + ]; + meta = with lib; { description = "Convert CSV files into a SQLite database"; homepage = "https://github.com/simonw/csvs-to-sqlite"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; - } diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 408e5b9f7bf..6506101908d 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -8,6 +9,7 @@ , gdk-pixbuf , atk , gtk4 +, Foundation , wrapGAppsHook4 , gobject-introspection , xvfb-run @@ -41,6 +43,8 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf atk gtk4 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Foundation ]; nativeCheckInputs = [ @@ -53,6 +57,9 @@ rustPlatform.buildRustPackage rec { runHook postCheck ''; + doCheck = stdenv.hostPlatform.isLinux + && (stdenv.hostPlatform == stdenv.buildPlatform); + passthru.tests.version = testers.testVersion { package = czkawka; command = "czkawka_cli --version"; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 6109ef3b0c0..e1ee9757fe8 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -76,6 +76,6 @@ in stdenv.mkDerivation rec { description = "Debian package maintenance scripts"; license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with maintainers; [raskin]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index d4e8c538b8e..c2573d2f4c1 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -18,7 +18,6 @@ , dtc , e2fsprogs , enableBloat ? true -, enableUnfree ? false , enjarify , fetchurl , file @@ -79,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "243"; + version = "245"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo="; + hash = "sha256-VeA8+gdKDDyNI9ica3YjGFw2Nl7Lb/L6/I7XNa9FMek="; }; outputs = [ @@ -174,6 +173,7 @@ python3.pkgs.buildPythonApplication rec { abootimg apksigcopier apksigner + apktool cbfstool colord enjarify @@ -214,8 +214,6 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals stdenv.isLinux [ oggvideotools ] # This doesn't work on aarch64-darwin ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] - # apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree - ++ lib.optionals enableUnfree [ apktool ] )); nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 1c925b6e6fa..d7a0fc1a747 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-of6mZ0SeiFXuXmvk64WoUNv6CLoj05K2kQpDQLMLwuY="; + sha256 = "sha256-kbrBnpoVeXSgmIqElpfAnoSutYwsnFaxFJpRsJPUE8k="; }; - cargoSha256 = "sha256-BS9K/1CyNYFwC/zQXEWZcSCjQyWgLgcVNbuyez2q/Ak="; + cargoSha256 = "sha256-WO8h5JUEiCpfsROQoRZj7I6em6REcJ2PfmoGN1zKRPg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index 6224811ccd5..29a7b32ce33 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-c3CMtPLo5NfKfr2meccFuDpf0ffZ3uBw995TEB5FSTs="; + hash = "sha256-+jmMy5Hi4EfMh/rBzBs5b+f48OZcR/Tw7IU1uTbwiCo="; }; - cargoHash = "sha256-2pIASIJ83lFfC7do/02MxY/OOMJG7McS6O8uRMy9kVs="; + cargoHash = "sha256-TjJ0645TRlNzduQgxYLZWz+rLFfRv12GuwXBcmNr/h8="; meta = with lib; { description = "A command-line hex viewer"; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index cd3d0598ef3..babda6edace 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.24"; + version = "0.10.26"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-PsxQzEU2rB/+B7kk6QMssUgH9Bj/kyla6O2MzgrZzUM="; + sha256 = "sha256-Tw+peSlcnSge4xOXslsFT6UTz7NQsy1Sy89vP2YjI90="; }; - vendorHash = "sha256-rDsHIwYfsu1kTtZhd2WMNnV9kNZUSjy6lkyUKPGSPsA="; + vendorHash = "sha256-nObY/79e6I5PYso917rZxwVt6pwwI5BY0nguP/1yirc="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 2fe32234157..e2a5483e54f 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.42.1"; + version = "2.43.1"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ScHlF5fvqBDvmI8p+o1LcQXZHXxKL5OS4AigE74AYVY="; + hash = "sha256-Ad3kcx5F6U6ucamhhD0c5st86nrJxCPX9e62u7yjPYI="; }; - vendorHash = "sha256-TTQ9cjtkcg606imz55k9bLSya7xFs2gKIqETcrPLKIQ="; + vendorHash = "sha256-iLjm8k0XbYcA05J52K8mGWleiMhSRjzzkTOrQ28UdVw="; postInstall = '' # Name the output the same way as the original build script does diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 68aa12eeb66..09cb91d9a15 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-P03L3UbXAlNUUwAwDqsIIs/ECB6s3GqCESbPK4AgnYg="; + sha256 = "sha256-CALMpedDCBlsYt31JOlwH1SOEhy/DFP6SdjoVkQ2KOs="; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' rm -f pkg/config/app_config_test.go diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 45cd9638238..51e3a77d8d6 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ]; buildInputs = [ gtk-doc lvm2 libxslt.bin - libtool readline gobject-introspection json-glib libuuid + libtool readline json-glib libuuid ]; meta = with lib; { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 398984b8c53..b5262837359 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,6 +1,7 @@ { buildPackages , db , fetchurl +, fetchpatch , groff , gzip , lib @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; - sha256 = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; + hash = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; }; outputs = [ "out" "doc" ]; @@ -31,7 +32,35 @@ stdenv.mkDerivation rec { buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) nativeCheckInputs = [ libiconv /* for 'iconv' binary */ ]; - patches = [ ./systemwide-man-db-conf.patch ]; + patches = [ + ./systemwide-man-db-conf.patch + # Remove the patches below when updating to the next man-db release. + # Patches addressing https://gitlab.com/man-db/man-db/-/issues/25 ... + (fetchpatch { + name = "update-warning-regex"; + url = "https://gitlab.com/man-db/man-db/-/commit/b12ffb9df7.patch"; + hash = "sha256-F+whRppaMZwgmGPKTXu2j1vZMNAm3vGNzNZcz9pg8Jc="; + }) + (fetchpatch { + name = "fix-test-failures-when-iconv-not-available"; + url = "https://gitlab.com/man-db/man-db/-/commit/26f46a60e5.patch"; + hash = "sha256-W1a6GkYn4J3py7GLZc37xmQBQR18Xvcvj4fJoZ21+0k="; + # The following files are excluded from the patch as they fail to apply + # cleanly on the 2.11.2 sources and are deemed irrelevant for building man-db. + excludes = [ "NEWS.md" ]; + }) + # ... and https://gitlab.com/man-db/man-db/-/issues/26. + (fetchpatch { + name = "improve-lexgrog-portability"; + url = "https://gitlab.com/man-db/man-db/-/commit/bbf7701c4f.patch"; + hash = "sha256-QLOVgV0S2NxxTBObD8bJFR1QDH0p2RGMJXLVNagfddc="; + }) + (fetchpatch { + name = "avoid-translation-fallout-from-lexgrog-fix"; + url = "https://gitlab.com/man-db/man-db/-/commit/043c3cb83c.patch"; + hash = "sha256-w12/LOGN9gO85zmqX7zookA55w3WUxBMJgWInpH5wms="; + }) + ]; postPatch = '' # Remove all mandatory manpaths. Nixpkgs makes no requirements on @@ -79,7 +108,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; + doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */; passthru.tests = { nixos = nixosTests.man; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 547bbba8904..53f9efac5fc 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.10"; + version = "6.20"; src = fetchFromGitHub { owner = "memtest86plus"; repo = "memtest86plus"; rev = "v${finalAttrs.version}"; - hash = "sha256-f40blxh/On/mC4m+eLNeWzdYzYoYpFOSBndVnREx68U="; + hash = "sha256-JzQJrAnPsa3GKNdy1PidOAZk7IQvRBi/YtmK2O9rWfM="; }; # Binaries are booted directly by BIOS/UEFI or bootloader diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 4fbb4994394..de5063135f8 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, stdenv, buildGoModule, fetchFromGitHub, buildNpmPackage +{ lib, buildGoModule, fetchFromGitHub, buildNpmPackage , nixosTests, debianutils, mkdocs, python3, python3Packages -, pkg-config, pixman, cairo, pango }: +}: buildGoModule rec { diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 12d0cf0bee1..1fa26d1f6d0 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , expat +, fetchpatch , fmt , proj , bzip2 @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch"; + hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4="; + }) + ]; + postPatch = '' # Remove bundled libraries rm -r contrib diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix new file mode 100644 index 00000000000..69044a2bb31 --- /dev/null +++ b/pkgs/tools/misc/qt6gtk2/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase }: + +stdenv.mkDerivation (finalAttrs: { + pname = "qt6gtk2"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "trialuser02"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-g5ZCwTnNEJJ57zEwNqMxrl0EWYJMt3PquZ2IsmxQYqk="; + }; + + buildInputs = [ gtk2 qtbase ]; + nativeBuildInputs = [ pkg-config qmake ]; + + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/qt-6/plugins/{platformthemes,styles} + cp -pr src/qt6gtk2-qtplugin/libqt6gtk2.so $out/lib/qt-6/plugins/platformthemes + cp -pr src/qt6gtk2-style/libqt6gtk2-style.so $out/lib/qt-6/plugins/styles + + runHook postInstall + ''; + + meta = { + description = "GTK+2.0 integration plugins for Qt6"; + license = lib.licenses.gpl2Plus; + homepage = "https://github.com/trialuser02/qt6gtk2"; + maintainers = [ lib.maintainers.misterio77 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 72cc8d8945f..ec573473de3 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -1,7 +1,6 @@ { curl , dbus , fetchFromGitHub -, fetchpatch , glib , json-glib , lib diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index dea4349c140..9e89b57f0e4 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -1,17 +1,17 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, gtk4 }: +{ lib, rustPlatform, fetchCrate, pkg-config, wrapGAppsHook4, gtk4 }: rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.3.0"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-D4WB1RdMPJfSLbJ96h3OuFhokfyY8Gamctm0XY694YM="; + hash = "sha256-vxAAAFLTIfLqYD7E/nwsHgFLhzMRF7DspIaWqAMZcXk="; }; - cargoSha256 = "sha256-C2I26E/dd18A4DDgOYGR8aS1RBrrNUwaXI4ZJHcrKy0="; + cargoHash = "sha256-6GKLBnG1p6iaFvnEQgfNlGpZwEG93tI256DCMLuJjOU="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 121e574358e..464b868b35d 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGui [ makeWrapper wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -51,7 +52,6 @@ stdenv.mkDerivation rec { util-linux ] ++ lib.optionals withGui [ cairo - gobject-introspection gtksourceview3 pango polkit diff --git a/pkgs/tools/misc/rtz/Cargo.lock b/pkgs/tools/misc/rtz/Cargo.lock new file mode 100644 index 00000000000..d754478f987 --- /dev/null +++ b/pkgs/tools/misc/rtz/Cargo.lock @@ -0,0 +1,3474 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +dependencies = [ + "backtrace", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "async-trait" +version = "0.1.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "binascii" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" + +[[package]] +name = "bincode" +version = "2.0.0-rc.3" +source = "git+https://github.com/bincode-org/bincode.git#224e41274b089e3833a3533459f5c5758c43ab2c" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chashmap" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45" +dependencies = [ + "owning_ref", + "parking_lot 0.4.8", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "chrono-tz" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", + "serde", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "config" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" +dependencies = [ + "async-trait", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron", + "rust-ini", + "serde", + "serde_json", + "toml 0.5.11", + "yaml-rust", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +dependencies = [ + "aes-gcm", + "base64 0.21.2", + "hkdf", + "percent-encoding", + "rand 0.8.5", + "sha2", + "subtle", + "time 0.3.23", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "devise" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6eacefd3f541c66fc61433d65e54e0e46e0a029a819a7dbbc7a7b489e8a85f8" +dependencies = [ + "devise_codegen", + "devise_core", +] + +[[package]] +name = "devise_codegen" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" +dependencies = [ + "devise_core", + "quote", +] + +[[package]] +name = "devise_core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" +dependencies = [ + "bitflags 2.3.3", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "dyn-clone" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" + +[[package]] +name = "earcutr" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +dependencies = [ + "itertools", + "num-traits", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "pear", + "serde", + "toml 0.7.6", + "uncased", + "version_check", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "geo" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +dependencies = [ + "earcutr", + "float_next_after", + "geo-types", + "geographiclib-rs", + "log", + "num-traits", + "robust", + "rstar", +] + +[[package]] +name = "geo-types" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +dependencies = [ + "approx", + "num-traits", + "rstar", + "serde", +] + +[[package]] +name = "geographiclib-rs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "geojson" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d728c1df1fbf328d74151efe6cb0586f79ee813346ea981add69bd22c9241b" +dependencies = [ + "geo-types", + "log", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin 0.9.8", + "stable_deref_trait", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memory_units" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "tokio", + "tokio-util", + "version_check", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "okapi" +version = "0.7.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce66b6366e049880a35c378123fddb630b1a1a3c37fa1ca70caaf4a09f6e2893" +dependencies = [ + "log", + "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owning_ref" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "parking_lot" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e" +dependencies = [ + "owning_ref", + "parking_lot_core 0.2.14", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" +dependencies = [ + "libc", + "rand 0.4.6", + "smallvec 0.6.14", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec 1.11.0", + "windows-targets", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] + +[[package]] +name = "pear" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi 1.0.0-rc", +] + +[[package]] +name = "pear_codegen" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pest" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "pest_meta" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi 0.5.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", + "version_check", + "yansi 1.0.0-rc", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "ref-cast" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "robust" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" + +[[package]] +name = "rocket" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9" +dependencies = [ + "async-stream", + "async-trait", + "atomic", + "binascii", + "bytes", + "either", + "figment", + "futures", + "indexmap 1.9.3", + "is-terminal", + "log", + "memchr", + "multer", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "rand 0.8.5", + "ref-cast", + "rocket_codegen", + "rocket_http", + "serde", + "serde_json", + "state", + "tempfile", + "time 0.3.23", + "tokio", + "tokio-stream", + "tokio-util", + "ubyte", + "version_check", + "yansi 0.5.1", +] + +[[package]] +name = "rocket_codegen" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b" +dependencies = [ + "devise", + "glob", + "indexmap 1.9.3", + "proc-macro2", + "quote", + "rocket_http", + "syn 2.0.26", + "unicode-xid", +] + +[[package]] +name = "rocket_cors" +version = "0.6.0-alpha2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12771b47f52e34d5d0e0e444aeba382863e73263cb9e18847e7d5b74aa2cbd0" +dependencies = [ + "http", + "log", + "regex", + "rocket", + "serde", + "serde_derive", + "unicase", + "unicase_serde", + "url", +] + +[[package]] +name = "rocket_http" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4" +dependencies = [ + "cookie", + "either", + "futures", + "http", + "hyper", + "indexmap 1.9.3", + "log", + "memchr", + "pear", + "percent-encoding", + "pin-project-lite", + "ref-cast", + "rustls", + "rustls-pemfile", + "serde", + "smallvec 1.11.0", + "stable-pattern", + "state", + "time 0.3.23", + "tokio", + "tokio-rustls", + "uncased", +] + +[[package]] +name = "rocket_okapi" +version = "0.8.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742098674565c8f0c35c77444f90344aafedebb71cfee9cdbf0185acc6b9cdb7" +dependencies = [ + "either", + "log", + "okapi", + "rocket", + "rocket_okapi_codegen", + "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "rocket_okapi_codegen" +version = "0.8.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c43f8edc57d88750a220b0ec1870a36c1106204ec99cc35131b49de3b954a4a" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "rocket_http", + "syn 1.0.109", +] + +[[package]] +name = "ron" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "serde", +] + +[[package]] +name = "rstar" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +dependencies = [ + "heapless", + "num-traits", + "smallvec 1.11.0", +] + +[[package]] +name = "rtz" +version = "0.4.2" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "chashmap", + "chrono", + "chrono-tz", + "clap", + "config", + "geo", + "geojson", + "getrandom", + "js-sys", + "log", + "pretty_assertions", + "rand 0.8.5", + "rayon", + "reqwest", + "rocket", + "rocket_cors", + "rocket_okapi", + "rtz-build", + "rtz-core", + "schemars", + "serde", + "serde_json", + "simple_logger", + "tokio", + "wasm-bindgen", + "wasm-bindgen-futures", + "wee_alloc", +] + +[[package]] +name = "rtz-build" +version = "0.2.3" +dependencies = [ + "reqwest", + "rtz-core", + "zip", +] + +[[package]] +name = "rtz-core" +version = "0.1.1" +dependencies = [ + "anyhow", + "bincode", + "chashmap", + "geo", + "geojson", + "pretty_assertions", + "rayon", + "serde", + "serde_json", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if 1.0.0", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "schemars" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "serde" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simple_logger" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2230cd5c29b815c9b699fb610b49a5ed65588f3509d9f0108be3a885da629333" +dependencies = [ + "colored", + "log", + "time 0.3.23", + "windows-sys 0.42.0", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable-pattern" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" +dependencies = [ + "memchr", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec 1.11.0", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ubyte" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" +dependencies = [ + "serde", +] + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "serde", + "version_check", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase_serde" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1" +dependencies = [ + "serde", + "unicase", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "wee_alloc" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "memory_units", + "winapi", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yansi" +version = "1.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee746ad3851dd3bc40e4a028ab3b00b99278d929e48957bcb2d111874a7e43e" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.23", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", +] diff --git a/pkgs/tools/misc/rtz/default.nix b/pkgs/tools/misc/rtz/default.nix new file mode 100644 index 00000000000..c4802b80342 --- /dev/null +++ b/pkgs/tools/misc/rtz/default.nix @@ -0,0 +1,56 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, openssl +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rtz"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "twitchax"; + repo = "rtz"; + rev = "v${version}"; + hash = "sha256-hxRZhUSmocHQJqrWVjT6af5zTM6KKCv4GycWlO1T6qM="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "bincode-2.0.0-rc.3" = "sha256-YCoTnIKqRObeyfTanjptTYeD9U2b2c+d4CJFWIiGckI="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + openssl + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildFeatures = [ "web" ]; + + env = { + # requires nightly features + RUSTC_BOOTSTRAP = true; + }; + + meta = with lib; { + description = "A tool to easily work with timezone lookups via a binary, a library, or a server"; + homepage = "https://github.com/twitchax/rtz"; + changelog = "https://github.com/twitchax/rtz/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 9a3c350b797..aa72394b710 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.2.2"; + version = "5.3.1"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-kdntnzGpu1NUP6rrBaH7ASwE7XT18vHcgf39bp5A4ds="; + sha256 = "sha256-llQt3m/qu7v5uQIfA1yxl2JZiFafk6sPgcvrIpQy/DI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index 705cf9f90d7..7d56b4aca86 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -8,23 +8,23 @@ integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== "@babel/code-frame@^7.0.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" + integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== dependencies: - "@babel/highlight" "^7.18.6" + "@babel/highlight" "^7.22.5" -"@babel/helper-validator-identifier@^7.18.6": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" + integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== +"@babel/highlight@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" + integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== dependencies: - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.0.0" js-tokens "^4.0.0" @@ -36,6 +36,16 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" +"@electron/asar@^3.2.1": + version "3.2.4" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.4.tgz#7e8635a3c4f6d8b3f8ae6efaf5ecb9fbf3bd9864" + integrity sha512-lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + "@electron/get@^2.0.0": version "2.0.2" resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" @@ -51,23 +61,74 @@ optionalDependencies: global-agent "^3.0.0" -"@electron/universal@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" - integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== +"@electron/notarize@^1.2.3": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.4.tgz#a7d38773f4cad40df111a5edc64037e5d768ea1e" + integrity sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg== dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + +"@electron/osx-sign@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151" + integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g== + dependencies: + compare-version "^0.1.2" + debug "^4.3.4" + fs-extra "^10.0.0" + isbinaryfile "^4.0.8" + minimist "^1.2.6" + plist "^3.0.5" + +"@electron/rebuild@^3.2.13": + version "3.2.13" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.13.tgz#98fbb98981b1a86162546a2ab91b2355569cca4c" + integrity sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g== + dependencies: + "@malept/cross-spawn-promise" "^2.0.0" + chalk "^4.0.0" + debug "^4.1.1" + detect-libc "^2.0.1" + fs-extra "^10.0.0" + got "^11.7.0" + node-abi "^3.0.0" + node-api-version "^0.1.4" + node-gyp "^9.0.0" + ora "^5.1.0" + semver "^7.3.5" + tar "^6.0.5" + yargs "^17.0.1" + +"@electron/universal@1.3.4": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777" + integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg== + dependencies: + "@electron/asar" "^3.2.1" "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" debug "^4.3.1" - dir-compare "^2.4.0" + dir-compare "^3.0.0" fs-extra "^9.0.1" minimatch "^3.0.4" plist "^3.0.4" -"@fortawesome/fontawesome-free@6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304" - integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A== +"@fortawesome/fontawesome-free@6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe" + integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ== + +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" @@ -76,6 +137,13 @@ dependencies: cross-spawn "^7.0.1" +"@malept/cross-spawn-promise@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" + integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== + dependencies: + cross-spawn "^7.0.1" + "@malept/flatpak-bundler@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" @@ -86,6 +154,31 @@ lodash "^4.17.15" tmp-promise "^3.0.2" +"@npmcli/fs@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e" + integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w== + dependencies: + semver "^7.3.5" + +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + +"@puppeteer/browsers@1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-1.4.1.tgz#9c8ba163c3ef77ae3fc9708ad1f5787263f7290e" + integrity sha512-H43VosMzywHCcYcgv0GXXopvwnV21Ud9g2aXbPlQUJj1Xcz9V0wBwHeFz6saFhx/3VKisZfI1GEKEOhQCau7Vw== + dependencies: + debug "4.3.4" + extract-zip "2.0.1" + progress "2.0.3" + proxy-agent "6.2.1" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + yargs "17.7.1" + "@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" @@ -114,27 +207,19 @@ "@types/responselike" "^1.0.0" "@types/debug@^4.1.6": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" - integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + version "4.1.8" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" + integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== dependencies: "@types/ms" "*" -"@types/fs-extra@^9.0.11": +"@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11": version "9.0.13" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== dependencies: "@types/node" "*" -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/http-cache-semantics@*": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" @@ -147,25 +232,20 @@ dependencies: "@types/node" "*" -"@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - "@types/ms@*": version "0.7.31" resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.11.19" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d" - integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw== + version "20.4.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.4.tgz#c79c7cc22c9d0e97a7944954c9e663bcbd92b0cb" + integrity sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew== -"@types/node@^16.11.26": - version "16.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65" - integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw== +"@types/node@^18.11.18": + version "18.17.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz#35d44267a33dd46b49ee0f73d31b05fd7407e290" + integrity sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg== "@types/plist@^3.0.1": version "3.0.2" @@ -187,18 +267,6 @@ resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.1": - version "17.0.22" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a" - integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g== - dependencies: - "@types/yargs-parser" "*" - "@types/yauzl@^2.9.1": version "2.10.0" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" @@ -206,13 +274,57 @@ dependencies: "@types/node" "*" -agent-base@6: +"@xmldom/xmldom@^0.8.8": + version "0.8.10" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" + integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== + +abbrev@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +acorn-walk@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== + +acorn@^8.7.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== + +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: debug "4" +agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" + integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg== + dependencies: + debug "^4.3.4" + +agentkeepalive@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255" + integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg== + dependencies: + debug "^4.1.0" + depd "^2.0.0" + humanize-ms "^1.2.1" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -233,6 +345,11 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -247,70 +364,86 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + app-builder-bin@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" - integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== +app-builder-lib@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.4.0.tgz#1606f94e99366eea9e7507228961b8396e40d546" + integrity sha512-EcdqtWvg1LAApKCfyRBukcVkmsa94s2e1VKHjZLpvA9/D14QEt8rHhffYeaA+cH/pVeoNVn2ob735KnfJKEEow== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" + "@electron/notarize" "^1.2.3" + "@electron/osx-sign" "^1.0.4" + "@electron/rebuild" "^3.2.13" + "@electron/universal" "1.3.4" "@malept/flatpak-bundler" "^0.4.0" + "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.6.0" - builder-util-runtime "9.1.1" + builder-util "24.4.0" + builder-util-runtime "9.2.1" chromium-pickle-js "^0.2.0" debug "^4.3.4" - ejs "^3.1.7" - electron-osx-sign "^0.6.0" - electron-publish "23.6.0" + ejs "^3.1.8" + electron-publish "24.4.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" is-ci "^3.0.0" - isbinaryfile "^4.0.10" + isbinaryfile "^5.0.0" js-yaml "^4.1.0" lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" + minimatch "^5.1.1" + read-config-file "6.3.2" sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" + semver "^7.3.8" + tar "^6.1.12" temp-file "^3.4.0" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + arch@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -asar@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" - integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== +ast-types@^0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782" + integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w== + dependencies: + tslib "^2.0.1" + astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -336,10 +469,10 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^1.2.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3" - integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw== +axios@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -355,7 +488,12 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bl@^4.0.3: +basic-ftp@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.3.tgz#b14c0fe8111ce001ec913686434fe0c2fb461228" + integrity sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g== + +bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -371,7 +509,7 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.0, bluebird@^3.5.5: +bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -381,10 +519,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -bootstrap@5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b" - integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ== +bootstrap@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.0.tgz#0718a7cc29040ee8dbf1bd652b896f3436a87c29" + integrity sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw== brace-expansion@^1.1.7: version "1.1.11" @@ -401,33 +539,15 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== - dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" - buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== -buffer-equal@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== - -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== +buffer-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== buffer-from@^1.0.0: version "1.1.2" @@ -442,46 +562,63 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" - integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== +builder-util-runtime@9.2.1: + version "9.2.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz#3184dcdf7ed6c47afb8df733813224ced4f624fd" + integrity sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" - integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== +builder-util@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.4.0.tgz#dbb201a118fd573180e6a1070cf4c0be6de80cd7" + integrity sha512-tONb/GIK1MKa1BcOPHE1naId3o5nj6gdka5kP7yUJh2DOfF+jMq3laiu+UOZH6A7ZtkMtnGNMYFKFTIv408n/A== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.1.1" - chalk "^4.1.1" + builder-util-runtime "9.2.1" + chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" - fs-extra "^10.0.0" + fs-extra "^10.1.0" http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.4.0" +cacache@^17.0.0: + version "17.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044" + integrity sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg== + dependencies: + "@npmcli/fs" "^3.1.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^7.7.1" + minipass "^5.0.0" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + p-map "^4.0.0" + ssri "^10.0.0" + tar "^6.1.11" + unique-filename "^3.0.0" + cacheable-lookup@^5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" @@ -505,7 +642,7 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.2, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -523,15 +660,39 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chromium-bidi@0.4.11: + version "0.4.11" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.11.tgz#d3eafb0a99f417406a734b889dacd777be5e227c" + integrity sha512-p03ajLhlQ5gebw3cmbDBFmBc2wnJM5dnXS8Phu6mblGn/KQd76yOVL5VwE0VAisa7oazNfKGTaXlIZ8Q5Bb9OA== + dependencies: + mitt "3.0.0" + chromium-pickle-js@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" - integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-spinners@^2.5.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db" + integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g== cli-truncate@^2.1.0: version "2.1.0" @@ -566,6 +727,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -590,10 +756,10 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== combined-stream@^1.0.8: version "1.0.8" @@ -602,13 +768,6 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== - dependencies: - graceful-readlink ">= 1.0.0" - commander@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" @@ -624,15 +783,28 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +config-file-ts@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99" + integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ== + dependencies: + glob "^7.1.6" + typescript "^4.0.2" + +console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== -cosmiconfig@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97" - integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ== +cosmiconfig@8.1.3: + version "8.1.3" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" + integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== dependencies: import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -646,12 +818,12 @@ crc@^3.8.0: dependencies: buffer "^5.1.0" -cross-fetch@3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== +cross-fetch@3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz#bae05aa31a4da760969756318feeee6e70f15d6c" + integrity sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g== dependencies: - node-fetch "2.6.7" + node-fetch "^2.6.11" cross-spawn@^6.0.0: version "6.0.5" @@ -664,7 +836,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.1, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -673,20 +845,18 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: +data-uri-to-buffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz#db89a9e279c2ffe74f50637a59a32fb23b3e4d7c" + integrity sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg== + +debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -699,58 +869,88 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +defaults@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== + dependencies: + clone "^1.0.2" + defer-to-connect@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== define-properties@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +degenerator@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-4.0.4.tgz#dbeeb602c64ce543c1f17e2c681d1d0cc9d4a0ac" + integrity sha512-MTZdZsuNxSBL92rsjx3VFWe57OpRlikyLbcx2B5Dmdv6oScqpMrvpY7zHLMymrUxo3U5+suPUMsNgW/+SZB1lg== + dependencies: + ast-types "^0.13.4" + escodegen "^1.14.3" + esprima "^4.0.1" + vm2 "^3.9.19" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -detect-libc@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" - integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +depd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +detect-libc@^2.0.0, detect-libc@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" + integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.1068969: - version "0.0.1068969" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz#8b9a4bc48aed1453bed08d62b07481f9abf4d6d8" - integrity sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ== - -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - -dmg-builder@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" - integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== - dependencies: - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - fs-extra "^10.0.0" +devtools-protocol@0.0.1120988: + version "0.0.1120988" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1120988.tgz#8fe49088919ae3b8df7235774633763f1f925066" + integrity sha512-39fCpE3Z78IaIPChJsP6Lhmkbf4dWXOmzLk/KFTdRkNk/0JymRIfUynDVRndV9HoDz8PyalK1UH21ST/ivwW5Q== + +dir-compare@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" + integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg== + dependencies: + buffer-equal "^1.0.0" + minimatch "^3.0.4" + +dmg-builder@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.4.0.tgz#46c80f119465f6a7275766c72b4f3d514cc8013d" + integrity sha512-p5z9Cx539GSBYb+b09Z+hMhuBTh/BrI71VRg4rgF6f2xtIRK/YlTGVS/O08k5OojoyhZcpS7JXxDVSmQoWgiiQ== + dependencies: + app-builder-lib "24.4.0" + builder-util "24.4.0" + builder-util-runtime "9.2.1" + fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: @@ -780,63 +980,55 @@ dotenv@^9.0.2: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== -ejs@^3.1.7: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + +ejs@^3.1.8: + version "3.1.9" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" + integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== dependencies: jake "^10.8.5" -electron-builder@^23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" - integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== - dependencies: - "@types/yargs" "^17.0.1" - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - dmg-builder "23.6.0" - fs-extra "^10.0.0" +electron-builder@^24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.4.0.tgz#8846efa45bac8f6b9afc181abf71a4e12530f045" + integrity sha512-D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g== + dependencies: + app-builder-lib "24.4.0" + builder-util "24.4.0" + builder-util-runtime "9.2.1" + chalk "^4.1.2" + dmg-builder "24.4.0" + fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" - read-config-file "6.2.0" - simple-update-notifier "^1.0.7" - yargs "^17.5.1" + read-config-file "6.3.2" + simple-update-notifier "^1.1.0" + yargs "^17.6.2" -electron-osx-sign@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" - integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== - dependencies: - bluebird "^3.5.0" - compare-version "^0.1.2" - debug "^2.6.8" - isbinaryfile "^3.0.2" - minimist "^1.2.0" - plist "^3.0.1" - -electron-publish@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" - integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== +electron-publish@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.4.0.tgz#a58f49ecd727620f65372881788ebb1a9b853284" + integrity sha512-U3mnVSxIfNrLW7ZnwiedFhcLf6ExPFXgAsx89WpfQFsV4gFAt/LG+H74p0m9NSvsLXiZuF82yXoxi7Ou8GHq4Q== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - fs-extra "^10.0.0" + builder-util "24.4.0" + builder-util-runtime "9.2.1" + chalk "^4.1.2" + fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@^22.0.0: - version "22.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5" - integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g== +electron@^25.1.0: + version "25.3.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.1.tgz#898cbb5e54d17ad0014123a10f5febc17638c6a9" + integrity sha512-t0QXXqgf0/P0OJ9LU3qpcBMK+wL0FRwTQfooBaaG08v5hywPzc1yplfb3l4tS1xC0Ttw8IBaKLBeEoRgxBRHjg== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^16.11.26" + "@types/node" "^18.11.18" extract-zip "^2.0.1" emoji-regex@^8.0.0: @@ -844,6 +1036,18 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -856,6 +1060,11 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -883,6 +1092,33 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escodegen@^1.14.3: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -901,6 +1137,11 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== +exponential-backoff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" + integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== + extract-zip@2.0.1, extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -927,6 +1168,11 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -939,7 +1185,7 @@ fessonia@^2.2.2: resolved "https://registry.yarnpkg.com/fessonia/-/fessonia-2.2.2.tgz#c8f9da5701d2e63efc9fd5793368929ddfaaf776" integrity sha512-FvlDFdwHBIxWl2K9XynAIR38NB8xn4vPPZDNK5nIQBnGwZ0xv5FxDXsz+pzYZrUqoEQPQBJemNrYhueD2de7qw== -filelist@^1.0.1: +filelist@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== @@ -951,6 +1197,14 @@ follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -1000,6 +1254,13 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" +fs-minipass@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz#5b383858efa8c1eb8c33b39e994f7e8555b8b3a3" + integrity sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g== + dependencies: + minipass "^5.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1010,18 +1271,33 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-stream@^4.0.0: @@ -1038,12 +1314,33 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +get-uri@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.1.tgz#cff2ba8d456c3513a04b70c45de4dbcca5b1527c" + integrity sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q== + dependencies: + basic-ftp "^5.0.2" + data-uri-to-buffer "^5.0.1" + debug "^4.3.4" + fs-extra "^8.1.0" + github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== -glob@^7.1.3, glob@^7.1.6: +glob@^10.2.2: + version "10.3.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b" + integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.0.3" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + +glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -1074,7 +1371,7 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -got@^11.8.5: +got@^11.7.0, got@^11.8.5: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== @@ -1091,15 +1388,10 @@ got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== has-flag@^3.0.0: version "3.0.0" @@ -1118,11 +1410,21 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1137,7 +1439,7 @@ hosted-git-info@^4.1.0: dependencies: lru-cache "^6.0.0" -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== @@ -1151,6 +1453,14 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" +http-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673" + integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ== + dependencies: + agent-base "^7.1.0" + debug "^4.3.4" + http2-wrapper@^1.0.0-beta.5.2: version "1.0.3" resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" @@ -1159,7 +1469,7 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" -https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: +https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -1167,6 +1477,21 @@ https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: agent-base "6" debug "4" +https-proxy-agent@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab" + integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ== + dependencies: + agent-base "^7.0.2" + debug "4" + +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -1195,6 +1520,16 @@ import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1213,6 +1548,16 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ip@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" + integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -1235,11 +1580,26 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + is-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -1247,18 +1607,16 @@ is-wsl@^2.1.1: dependencies: is-docker "^2.0.0" -isbinaryfile@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" - integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== - dependencies: - buffer-alloc "^1.2.0" - -isbinaryfile@^4.0.10: +isbinaryfile@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== +isbinaryfile@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234" + integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -1269,15 +1627,24 @@ iso8601-duration@^2.1.1: resolved "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-2.1.1.tgz#88d9e481525b50e57840bc93fb8a1727a7d849d2" integrity sha512-VGGpW30/R57FpG1J7RqqKBAaK7lIiudlZkQ5tRoO9hNlKYQNnhs60DQpXlPFBmp6I+kJ61PHkI3f/T7cR4wfbw== +jackspeak@^2.0.3: + version "2.2.1" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz#655e8cf025d872c9c03d3eb63e8f0c024fef16a6" + integrity sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== dependencies: async "^3.2.3" chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" + filelist "^1.0.4" + minimatch "^3.1.2" js-tokens@^4.0.0: version "4.0.0" @@ -1341,9 +1708,9 @@ keytar@^7.9.0: prebuild-install "^7.0.1" keyv@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" - integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== + version "4.5.3" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25" + integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug== dependencies: json-buffer "3.0.1" @@ -1352,6 +1719,14 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -1362,6 +1737,14 @@ lodash@^4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -1374,6 +1757,37 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.14.1, lru-cache@^7.7.1: + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== + +"lru-cache@^9.1.1 || ^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61" + integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw== + +make-fetch-happen@^11.0.3: + version "11.1.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f" + integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^17.0.0" + http-cache-semantics "^4.1.1" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^5.0.0" + minipass-fetch "^3.0.0" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^10.0.0" + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1398,6 +1812,11 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1408,13 +1827,6 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -1422,17 +1834,63 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: +minimatch@^5.0.1, minimatch@^5.1.1: version "5.1.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.3: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz#d9df70085609864331b533c960fd4ffaa78d15ce" + integrity sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ== + dependencies: + minipass "^5.0.0" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" minipass@^3.0.0: version "3.3.6" @@ -1441,12 +1899,17 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz#26fc3364d5ea6cb971c6e5259eac67a0887510d1" - integrity sha512-4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -minizlib@^2.1.1: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e" + integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA== + +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -1454,6 +1917,11 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" +mitt@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd" + integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ== + mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -1464,30 +1932,40 @@ mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + napi-build-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +netmask@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" + integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@^3.3.0: - version "3.31.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355" - integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ== +node-abi@^3.0.0, node-abi@^3.3.0: + version "3.45.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5" + integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ== dependencies: semver "^7.3.5" @@ -1501,13 +1979,44 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== +node-api-version@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" + integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== + dependencies: + semver "^7.3.5" + +node-fetch@^2.6.11: + version "2.6.12" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba" + integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g== dependencies: whatwg-url "^5.0.0" +node-gyp@^9.0.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369" + integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^11.0.3" + nopt "^6.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== + dependencies: + abbrev "^1.0.0" + normalize-url@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" @@ -1520,6 +2029,16 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -1532,6 +2051,40 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +ora@^5.1.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + p-cancelable@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" @@ -1542,6 +2095,35 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +pac-proxy-agent@^6.0.3: + version "6.0.4" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-6.0.4.tgz#f90d066808974cd6813dfcdac69a2aa483b18ba1" + integrity sha512-FbJYeusBOZNe6bmrC2/+r/HljwExryon16lNKEU82gWiwIPMCEktUPSEAcTkO9K3jd/YPGuX/azZel1ltmo6nQ== + dependencies: + agent-base "^7.0.2" + debug "^4.3.4" + get-uri "^6.0.1" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.0" + pac-resolver "^6.0.1" + socks-proxy-agent "^8.0.1" + +pac-resolver@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-6.0.2.tgz#742ef24d2805b18c0a684ac02bcb0b5ce9644648" + integrity sha512-EQpuJ2ifOjpZY5sg1Q1ZeAxvtLwR7Mj3RgY8cysPGbsRu3RBXyJFWxnMus9PScjxya/0LzvVDxNh/gl0eXBU4w== + dependencies: + degenerator "^4.0.4" + ip "^1.1.8" + netmask "^2.0.2" + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -1574,6 +2156,14 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -1584,11 +2174,12 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -plist@^3.0.1, plist@^3.0.4: - version "3.0.6" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" - integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== +plist@^3.0.4, plist@^3.0.5: + version "3.1.0" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" + integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== dependencies: + "@xmldom/xmldom" "^0.8.8" base64-js "^1.5.1" xmlbuilder "^15.1.1" @@ -1610,12 +2201,39 @@ prebuild-install@^7.0.1: tar-fs "^2.0.0" tunnel-agent "^0.6.0" +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== + progress@2.0.3, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -proxy-from-env@1.1.0, proxy-from-env@^1.1.0: +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +proxy-agent@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.2.1.tgz#062df6609a4012fd1c108974865599b61e77abde" + integrity sha512-OIbBKlRAT+ycCm6wAYIzMwPejzRtjy8F3QiDX0eKOA3e4pe3U9F/IvzcHP42bmgQxVv97juG+J8/gx+JIeCX/Q== + dependencies: + agent-base "^7.0.2" + debug "^4.3.4" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.0" + lru-cache "^7.14.1" + pac-proxy-agent "^6.0.3" + proxy-from-env "^1.1.0" + socks-proxy-agent "^8.0.1" + +proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -1633,33 +2251,26 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -puppeteer-core@19.4.0: - version "19.4.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz#3f52945d8cfa20cf8721a7902afcd8a1a299b54d" - integrity sha512-gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ== +puppeteer-core@20.5.0: + version "20.5.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-20.5.0.tgz#4b9ccd6c4ca35fe02373bf2147dc75b42ebd22c4" + integrity sha512-9ddHXUQ7jpliGei87zYTuEZYQvFj6Lzk5R8w4vT4gMmNArkEqC5CX72TnVIJiTUbiTpOXJkvMQaXIHYopjdUtQ== dependencies: - cross-fetch "3.1.5" + "@puppeteer/browsers" "1.4.1" + chromium-bidi "0.4.11" + cross-fetch "3.1.6" debug "4.3.4" - devtools-protocol "0.0.1068969" - extract-zip "2.0.1" - https-proxy-agent "5.0.1" - proxy-from-env "1.1.0" - rimraf "3.0.2" - tar-fs "2.1.1" - unbzip2-stream "1.4.3" - ws "8.10.0" + devtools-protocol "0.0.1120988" + ws "8.13.0" -puppeteer@19.4.0: - version "19.4.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz#3adfcb415e96d7b5900a66a1097947272313ee9f" - integrity sha512-sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg== +puppeteer@20.5.0: + version "20.5.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-20.5.0.tgz#453f42edb2cb085bb237914c2bcda7938b7ab1c2" + integrity sha512-3j0JShJGDT5z8rfDKf+wZQq3IHxw7JaDAdP7py5H5zOIgmqNG0e8R19y4tFzJ8i2WC4H/0bC51rIrTXyDop1FA== dependencies: - cosmiconfig "8.0.0" - devtools-protocol "0.0.1068969" - https-proxy-agent "5.0.1" - progress "2.0.3" - proxy-from-env "1.1.0" - puppeteer-core "19.4.0" + "@puppeteer/browsers" "1.4.1" + cosmiconfig "8.1.3" + puppeteer-core "20.5.0" quick-lru@^5.1.1: version "5.1.1" @@ -1676,21 +2287,22 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" - integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== +read-config-file@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411" + integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q== dependencies: + config-file-ts "^0.2.4" dotenv "^9.0.2" dotenv-expand "^5.1.0" js-yaml "^4.1.0" json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -1718,7 +2330,20 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" -rimraf@3.0.2, rimraf@^3.0.0: +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -1765,19 +2390,19 @@ semver-compare@^1.0.0: integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -1793,6 +2418,11 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -1817,11 +2447,16 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967" + integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q== + simple-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" @@ -1836,7 +2471,7 @@ simple-get@^4.0.0: once "^1.3.1" simple-concat "^1.0.0" -simple-update-notifier@^1.0.7: +simple-update-notifier@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== @@ -1852,11 +2487,37 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2: +smart-buffer@^4.0.2, smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks-proxy-agent@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120" + integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ== + dependencies: + agent-base "^7.0.1" + debug "^4.3.4" + socks "^2.7.1" + +socks@^2.6.2, socks@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + source-map-support@^0.5.19: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -1865,7 +2526,7 @@ source-map-support@^0.5.19: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.6.0: +source-map@^0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -1875,12 +2536,19 @@ sprintf-js@^1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== +ssri@^10.0.0: + version "10.0.4" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" + integrity sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ== + dependencies: + minipass "^5.0.0" + stat-mode@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1889,6 +2557,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -1896,13 +2573,20 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -1955,14 +2639,14 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.11: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== +tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2: + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -2006,6 +2690,11 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tslib@^2.0.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -2013,11 +2702,23 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== + dependencies: + prelude-ls "~1.1.2" + type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== +typescript@^4.0.2: + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== + unbzip2-stream@1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" @@ -2026,6 +2727,20 @@ unbzip2-stream@1.4.3: buffer "^5.2.1" through "^2.3.8" +unique-filename@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" + integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== + dependencies: + unique-slug "^4.0.0" + +unique-slug@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" + integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== + dependencies: + imurmurhash "^0.1.4" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -2062,6 +2777,21 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vm2@^3.9.19: + version "3.9.19" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.19.tgz#be1e1d7a106122c6c492b4d51c2e8b93d3ed6a4a" + integrity sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== + dependencies: + defaults "^1.0.3" + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -2082,14 +2812,26 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wrap-ansi@^7.0.0: +wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +word-wrap@~1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -2098,15 +2840,24 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@8.10.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" - integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== +ws@8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2128,10 +2879,23 @@ yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.5.1: - version "17.6.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== +yargs@17.7.1: + version "17.7.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" + integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + +yargs@^17.0.1, yargs@^17.6.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: cliui "^8.0.1" escalade "^3.1.1" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index e77dea2cc27..cbb4c1d2dcb 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -10,27 +10,27 @@ }; } { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; + name = "_babel_code_frame___code_frame_7.22.5.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; + name = "_babel_code_frame___code_frame_7.22.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz"; + sha512 = "Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.22.5.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.22.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"; + sha512 = "aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="; }; } { - name = "_babel_highlight___highlight_7.18.6.tgz"; + name = "_babel_highlight___highlight_7.22.5.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; + name = "_babel_highlight___highlight_7.22.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz"; + sha512 = "BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw=="; }; } { @@ -42,6 +42,14 @@ }; } { + name = "_electron_asar___asar_3.2.4.tgz"; + path = fetchurl { + name = "_electron_asar___asar_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.4.tgz"; + sha512 = "lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g=="; + }; + } + { name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { name = "_electron_get___get_2.0.2.tgz"; @@ -50,19 +58,51 @@ }; } { - name = "_electron_universal___universal_1.2.1.tgz"; + name = "_electron_notarize___notarize_1.2.4.tgz"; + path = fetchurl { + name = "_electron_notarize___notarize_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.4.tgz"; + sha512 = "W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg=="; + }; + } + { + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + path = fetchurl { + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz"; + sha512 = "xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g=="; + }; + } + { + name = "_electron_rebuild___rebuild_3.2.13.tgz"; + path = fetchurl { + name = "_electron_rebuild___rebuild_3.2.13.tgz"; + url = "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.13.tgz"; + sha512 = "DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g=="; + }; + } + { + name = "_electron_universal___universal_1.3.4.tgz"; path = fetchurl { - name = "_electron_universal___universal_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz"; - sha512 = "7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ=="; + name = "_electron_universal___universal_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz"; + sha512 = "BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg=="; }; } { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; + name = "_fortawesome_fontawesome_free___fontawesome_free_6.4.0.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz"; - sha512 = "viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A=="; + name = "_fortawesome_fontawesome_free___fontawesome_free_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz"; + sha512 = "0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ=="; + }; + } + { + name = "_isaacs_cliui___cliui_8.0.2.tgz"; + path = fetchurl { + name = "_isaacs_cliui___cliui_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz"; + sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; } { @@ -74,6 +114,14 @@ }; } { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; + sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; + }; + } + { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; @@ -82,6 +130,30 @@ }; } { + name = "_npmcli_fs___fs_3.1.0.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz"; + sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; + }; + } + { + name = "_pkgjs_parseargs___parseargs_0.11.0.tgz"; + path = fetchurl { + name = "_pkgjs_parseargs___parseargs_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"; + sha512 = "+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="; + }; + } + { + name = "_puppeteer_browsers___browsers_1.4.1.tgz"; + path = fetchurl { + name = "_puppeteer_browsers___browsers_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-1.4.1.tgz"; + sha512 = "H43VosMzywHCcYcgv0GXXopvwnV21Ud9g2aXbPlQUJj1Xcz9V0wBwHeFz6saFhx/3VKisZfI1GEKEOhQCau7Vw=="; + }; + } + { name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { name = "_sindresorhus_is___is_4.6.0.tgz"; @@ -114,11 +186,11 @@ }; } { - name = "_types_debug___debug_4.1.7.tgz"; + name = "_types_debug___debug_4.1.8.tgz"; path = fetchurl { - name = "_types_debug___debug_4.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; + name = "_types_debug___debug_4.1.8.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz"; + sha512 = "/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ=="; }; } { @@ -130,14 +202,6 @@ }; } { - name = "_types_glob___glob_7.2.0.tgz"; - path = fetchurl { - name = "_types_glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; - }; - } - { name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; path = fetchurl { name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; @@ -154,14 +218,6 @@ }; } { - name = "_types_minimatch___minimatch_5.1.2.tgz"; - path = fetchurl { - name = "_types_minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; - }; - } - { name = "_types_ms___ms_0.7.31.tgz"; path = fetchurl { name = "_types_ms___ms_0.7.31.tgz"; @@ -170,19 +226,19 @@ }; } { - name = "_types_node___node_18.11.19.tgz"; + name = "_types_node___node_20.4.4.tgz"; path = fetchurl { - name = "_types_node___node_18.11.19.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz"; - sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; + name = "_types_node___node_20.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-20.4.4.tgz"; + sha512 = "CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew=="; }; } { - name = "_types_node___node_16.18.12.tgz"; + name = "_types_node___node_18.17.0.tgz"; path = fetchurl { - name = "_types_node___node_16.18.12.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz"; - sha512 = "vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw=="; + name = "_types_node___node_18.17.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz"; + sha512 = "GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg=="; }; } { @@ -210,27 +266,43 @@ }; } { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; + name = "_types_yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "_types_yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; + sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; + }; + } + { + name = "_xmldom_xmldom___xmldom_0.8.10.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; + name = "_xmldom_xmldom___xmldom_0.8.10.tgz"; + url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; + sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; }; } { - name = "_types_yargs___yargs_17.0.22.tgz"; + name = "abbrev___abbrev_1.1.1.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.22.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz"; - sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g=="; + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; } { - name = "_types_yauzl___yauzl_2.10.0.tgz"; + name = "acorn_walk___acorn_walk_8.2.0.tgz"; path = fetchurl { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; + name = "acorn_walk___acorn_walk_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; + }; + } + { + name = "acorn___acorn_8.10.0.tgz"; + path = fetchurl { + name = "acorn___acorn_8.10.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz"; + sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; }; } { @@ -242,6 +314,30 @@ }; } { + name = "agent_base___agent_base_7.1.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz"; + sha512 = "o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg=="; + }; + } + { + name = "agentkeepalive___agentkeepalive_4.3.0.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; + sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; + }; + } + { + 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"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + } + { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; @@ -266,6 +362,14 @@ }; } { + name = "ansi_regex___ansi_regex_6.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz"; + sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + }; + } + { name = "ansi_styles___ansi_styles_3.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; @@ -282,6 +386,14 @@ }; } { + name = "ansi_styles___ansi_styles_6.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz"; + sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; + }; + } + { name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; path = fetchurl { name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; @@ -290,11 +402,19 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + name = "app_builder_lib___app_builder_lib_24.4.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; - sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; + name = "app_builder_lib___app_builder_lib_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.4.0.tgz"; + sha512 = "EcdqtWvg1LAApKCfyRBukcVkmsa94s2e1VKHjZLpvA9/D14QEt8rHhffYeaA+cH/pVeoNVn2ob735KnfJKEEow=="; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; } { @@ -306,19 +426,19 @@ }; } { - name = "argparse___argparse_2.0.1.tgz"; + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; } { - name = "asar___asar_3.2.0.tgz"; + name = "argparse___argparse_2.0.1.tgz"; path = fetchurl { - name = "asar___asar_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz"; - sha512 = "COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg=="; + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -330,6 +450,14 @@ }; } { + name = "ast_types___ast_types_0.13.4.tgz"; + path = fetchurl { + name = "ast_types___ast_types_0.13.4.tgz"; + url = "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz"; + sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; + }; + } + { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { name = "astral_regex___astral_regex_2.0.0.tgz"; @@ -370,11 +498,11 @@ }; } { - name = "axios___axios_1.3.2.tgz"; + name = "axios___axios_1.4.0.tgz"; path = fetchurl { - name = "axios___axios_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz"; - sha512 = "1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw=="; + name = "axios___axios_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz"; + sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; }; } { @@ -394,6 +522,14 @@ }; } { + name = "basic_ftp___basic_ftp_5.0.3.tgz"; + path = fetchurl { + name = "basic_ftp___basic_ftp_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.3.tgz"; + sha512 = "QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g=="; + }; + } + { name = "bl___bl_4.1.0.tgz"; path = fetchurl { name = "bl___bl_4.1.0.tgz"; @@ -426,11 +562,11 @@ }; } { - name = "bootstrap___bootstrap_5.2.3.tgz"; + name = "bootstrap___bootstrap_5.3.0.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_5.2.3.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz"; - sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="; + name = "bootstrap___bootstrap_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.0.tgz"; + sha512 = "UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw=="; }; } { @@ -450,22 +586,6 @@ }; } { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - path = fetchurl { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; - }; - } - { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - path = fetchurl { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; - }; - } - { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; @@ -474,19 +594,11 @@ }; } { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha512 = "tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ=="; - }; - } - { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; + name = "buffer_equal___buffer_equal_1.0.1.tgz"; path = fetchurl { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha512 = "T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="; + name = "buffer_equal___buffer_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz"; + sha512 = "QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg=="; }; } { @@ -506,19 +618,27 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.2.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; - sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; + name = "builder_util_runtime___builder_util_runtime_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz"; + sha512 = "2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA=="; }; } { - name = "builder_util___builder_util_23.6.0.tgz"; + name = "builder_util___builder_util_24.4.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; - sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; + name = "builder_util___builder_util_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.4.0.tgz"; + sha512 = "tONb/GIK1MKa1BcOPHE1naId3o5nj6gdka5kP7yUJh2DOfF+jMq3laiu+UOZH6A7ZtkMtnGNMYFKFTIv408n/A=="; + }; + } + { + name = "cacache___cacache_17.1.3.tgz"; + path = fetchurl { + name = "cacache___cacache_17.1.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz"; + sha512 = "jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg=="; }; } { @@ -530,11 +650,11 @@ }; } { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; + name = "cacheable_request___cacheable_request_7.0.4.tgz"; path = fetchurl { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz"; - sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; + name = "cacheable_request___cacheable_request_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz"; + sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; } { @@ -578,6 +698,14 @@ }; } { + name = "chromium_bidi___chromium_bidi_0.4.11.tgz"; + path = fetchurl { + name = "chromium_bidi___chromium_bidi_0.4.11.tgz"; + url = "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.11.tgz"; + sha512 = "p03ajLhlQ5gebw3cmbDBFmBc2wnJM5dnXS8Phu6mblGn/KQd76yOVL5VwE0VAisa7oazNfKGTaXlIZ8Q5Bb9OA=="; + }; + } + { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; path = fetchurl { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; @@ -586,11 +714,35 @@ }; } { - name = "ci_info___ci_info_3.7.1.tgz"; + name = "ci_info___ci_info_3.8.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz"; + sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; + }; + } + { + 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"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + } + { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz"; - sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + } + { + name = "cli_spinners___cli_spinners_2.9.0.tgz"; + path = fetchurl { + name = "cli_spinners___cli_spinners_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz"; + sha512 = "4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g=="; }; } { @@ -626,6 +778,14 @@ }; } { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; + }; + } + { name = "color_convert___color_convert_1.9.3.tgz"; path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; @@ -658,11 +818,11 @@ }; } { - name = "colors___colors_1.0.3.tgz"; + name = "color_support___color_support_1.1.3.tgz"; path = fetchurl { - name = "colors___colors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha512 = "pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="; + name = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; } { @@ -674,14 +834,6 @@ }; } { - name = "commander___commander_2.9.0.tgz"; - path = fetchurl { - name = "commander___commander_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; - }; - } - { name = "commander___commander_5.1.0.tgz"; path = fetchurl { name = "commander___commander_5.1.0.tgz"; @@ -706,6 +858,22 @@ }; } { + name = "config_file_ts___config_file_ts_0.2.4.tgz"; + path = fetchurl { + name = "config_file_ts___config_file_ts_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz"; + sha512 = "cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ=="; + }; + } + { + 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"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; + }; + } + { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -714,11 +882,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; + name = "cosmiconfig___cosmiconfig_8.1.3.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz"; - sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ=="; + name = "cosmiconfig___cosmiconfig_8.1.3.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz"; + sha512 = "/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw=="; }; } { @@ -730,11 +898,11 @@ }; } { - name = "cross_fetch___cross_fetch_3.1.5.tgz"; + name = "cross_fetch___cross_fetch_3.1.6.tgz"; path = fetchurl { - name = "cross_fetch___cross_fetch_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz"; - sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; + name = "cross_fetch___cross_fetch_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz"; + sha512 = "riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g=="; }; } { @@ -754,19 +922,19 @@ }; } { - name = "debug___debug_4.3.4.tgz"; + name = "data_uri_to_buffer___data_uri_to_buffer_5.0.1.tgz"; path = fetchurl { - name = "debug___debug_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + name = "data_uri_to_buffer___data_uri_to_buffer_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz"; + sha512 = "a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg=="; }; } { - name = "debug___debug_2.6.9.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { @@ -786,6 +954,22 @@ }; } { + name = "deep_is___deep_is_0.1.4.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; + }; + } + { + name = "defaults___defaults_1.0.4.tgz"; + path = fetchurl { + name = "defaults___defaults_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz"; + sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; + }; + } + { name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; path = fetchurl { name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; @@ -794,11 +978,19 @@ }; } { - name = "define_properties___define_properties_1.1.4.tgz"; + name = "define_properties___define_properties_1.2.0.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; + }; + } + { + name = "degenerator___degenerator_4.0.4.tgz"; path = fetchurl { - name = "define_properties___define_properties_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + name = "degenerator___degenerator_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/degenerator/-/degenerator-4.0.4.tgz"; + sha512 = "MTZdZsuNxSBL92rsjx3VFWe57OpRlikyLbcx2B5Dmdv6oScqpMrvpY7zHLMymrUxo3U5+suPUMsNgW/+SZB1lg=="; }; } { @@ -810,11 +1002,27 @@ }; } { - name = "detect_libc___detect_libc_2.0.1.tgz"; + 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"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; + }; + } + { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + } + { + name = "detect_libc___detect_libc_2.0.2.tgz"; path = fetchurl { - name = "detect_libc___detect_libc_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; - sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; + name = "detect_libc___detect_libc_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz"; + sha512 = "UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw=="; }; } { @@ -826,27 +1034,27 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1120988.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz"; - sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ=="; + name = "devtools_protocol___devtools_protocol_0.0.1120988.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1120988.tgz"; + sha512 = "39fCpE3Z78IaIPChJsP6Lhmkbf4dWXOmzLk/KFTdRkNk/0JymRIfUynDVRndV9HoDz8PyalK1UH21ST/ivwW5Q=="; }; } { - name = "dir_compare___dir_compare_2.4.0.tgz"; + name = "dir_compare___dir_compare_3.3.0.tgz"; path = fetchurl { - name = "dir_compare___dir_compare_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; + name = "dir_compare___dir_compare_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz"; + sha512 = "J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg=="; }; } { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; + name = "dmg_builder___dmg_builder_24.4.0.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; - sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; + name = "dmg_builder___dmg_builder_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.4.0.tgz"; + sha512 = "p5z9Cx539GSBYb+b09Z+hMhuBTh/BrI71VRg4rgF6f2xtIRK/YlTGVS/O08k5OojoyhZcpS7JXxDVSmQoWgiiQ=="; }; } { @@ -874,43 +1082,43 @@ }; } { - name = "ejs___ejs_3.1.8.tgz"; + name = "eastasianwidth___eastasianwidth_0.2.0.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.8.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; + name = "eastasianwidth___eastasianwidth_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; + sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; }; } { - name = "electron_builder___electron_builder_23.6.0.tgz"; + name = "ejs___ejs_3.1.9.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; - sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; + name = "ejs___ejs_3.1.9.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz"; + sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; } { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; + name = "electron_builder___electron_builder_24.4.0.tgz"; path = fetchurl { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz"; - sha512 = "+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg=="; + name = "electron_builder___electron_builder_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.4.0.tgz"; + sha512 = "D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g=="; }; } { - name = "electron_publish___electron_publish_23.6.0.tgz"; + name = "electron_publish___electron_publish_24.4.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; - sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; + name = "electron_publish___electron_publish_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.4.0.tgz"; + sha512 = "U3mnVSxIfNrLW7ZnwiedFhcLf6ExPFXgAsx89WpfQFsV4gFAt/LG+H74p0m9NSvsLXiZuF82yXoxi7Ou8GHq4Q=="; }; } { - name = "electron___electron_22.2.0.tgz"; + name = "electron___electron_25.3.1.tgz"; path = fetchurl { - name = "electron___electron_22.2.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz"; - sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g=="; + name = "electron___electron_25.3.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-25.3.1.tgz"; + sha512 = "t0QXXqgf0/P0OJ9LU3qpcBMK+wL0FRwTQfooBaaG08v5hywPzc1yplfb3l4tS1xC0Ttw8IBaKLBeEoRgxBRHjg=="; }; } { @@ -922,6 +1130,22 @@ }; } { + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; + }; + } + { + name = "encoding___encoding_0.1.13.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + } + { name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; @@ -938,6 +1162,14 @@ }; } { + name = "err_code___err_code_2.0.3.tgz"; + path = fetchurl { + name = "err_code___err_code_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + } + { name = "error_ex___error_ex_1.3.2.tgz"; path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; @@ -978,6 +1210,38 @@ }; } { + 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"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; + }; + } + { + 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"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + } + { + 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"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + } + { + 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"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + } + { name = "execa___execa_1.0.0.tgz"; path = fetchurl { name = "execa___execa_1.0.0.tgz"; @@ -994,6 +1258,14 @@ }; } { + name = "exponential_backoff___exponential_backoff_3.1.1.tgz"; + path = fetchurl { + name = "exponential_backoff___exponential_backoff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz"; + sha512 = "dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="; + }; + } + { name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; @@ -1026,6 +1298,14 @@ }; } { + 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"; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; + }; + } + { name = "fd_slicer___fd_slicer_1.1.0.tgz"; path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; @@ -1058,6 +1338,14 @@ }; } { + name = "foreground_child___foreground_child_3.1.1.tgz"; + path = fetchurl { + name = "foreground_child___foreground_child_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz"; + sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + }; + } + { name = "form_data___form_data_4.0.0.tgz"; path = fetchurl { name = "form_data___form_data_4.0.0.tgz"; @@ -1106,6 +1394,14 @@ }; } { + name = "fs_minipass___fs_minipass_3.0.2.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz"; + sha512 = "2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g=="; + }; + } + { name = "fs.realpath___fs.realpath_1.0.0.tgz"; path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; @@ -1122,6 +1418,14 @@ }; } { + name = "gauge___gauge_4.0.4.tgz"; + path = fetchurl { + name = "gauge___gauge_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; + }; + } + { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; @@ -1130,11 +1434,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.1.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; + name = "get_intrinsic___get_intrinsic_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; + sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; }; } { @@ -1154,6 +1458,14 @@ }; } { + name = "get_uri___get_uri_6.0.1.tgz"; + path = fetchurl { + name = "get_uri___get_uri_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.1.tgz"; + sha512 = "7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q=="; + }; + } + { name = "github_from_package___github_from_package_0.0.0.tgz"; path = fetchurl { name = "github_from_package___github_from_package_0.0.0.tgz"; @@ -1162,6 +1474,14 @@ }; } { + name = "glob___glob_10.3.3.tgz"; + path = fetchurl { + name = "glob___glob_10.3.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz"; + sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; + }; + } + { name = "glob___glob_7.2.3.tgz"; path = fetchurl { name = "glob___glob_7.2.3.tgz"; @@ -1194,19 +1514,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; + name = "graceful_fs___graceful_fs_4.2.11.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - path = fetchurl { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; + name = "graceful_fs___graceful_fs_4.2.11.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz"; + sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; } { @@ -1234,6 +1546,14 @@ }; } { + name = "has_proto___has_proto_1.0.1.tgz"; + path = fetchurl { + name = "has_proto___has_proto_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + }; + } + { name = "has_symbols___has_symbols_1.0.3.tgz"; path = fetchurl { name = "has_symbols___has_symbols_1.0.3.tgz"; @@ -1242,6 +1562,14 @@ }; } { + 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"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; + }; + } + { name = "has___has_1.0.3.tgz"; path = fetchurl { name = "has___has_1.0.3.tgz"; @@ -1274,6 +1602,14 @@ }; } { + name = "http_proxy_agent___http_proxy_agent_7.0.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz"; + sha512 = "+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ=="; + }; + } + { name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; path = fetchurl { name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; @@ -1290,6 +1626,22 @@ }; } { + name = "https_proxy_agent___https_proxy_agent_7.0.1.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz"; + sha512 = "Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ=="; + }; + } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + }; + } + { name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; @@ -1322,6 +1674,22 @@ }; } { + 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"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; + }; + } + { + 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"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + } + { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; @@ -1346,6 +1714,22 @@ }; } { + name = "ip___ip_1.1.8.tgz"; + path = fetchurl { + name = "ip___ip_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz"; + sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + }; + } + { + name = "ip___ip_2.0.0.tgz"; + path = fetchurl { + name = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + }; + } + { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; @@ -1378,6 +1762,22 @@ }; } { + name = "is_interactive___is_interactive_1.0.0.tgz"; + path = fetchurl { + name = "is_interactive___is_interactive_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; + }; + } + { + name = "is_lambda___is_lambda_1.0.1.tgz"; + path = fetchurl { + name = "is_lambda___is_lambda_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; + }; + } + { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; @@ -1386,19 +1786,19 @@ }; } { - name = "is_wsl___is_wsl_2.2.0.tgz"; + name = "is_unicode_supported___is_unicode_supported_0.1.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"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; } { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + name = "is_wsl___is_wsl_2.2.0.tgz"; path = fetchurl { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -1410,6 +1810,14 @@ }; } { + name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; + sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; + }; + } + { name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; @@ -1426,11 +1834,19 @@ }; } { - name = "jake___jake_10.8.5.tgz"; + name = "jackspeak___jackspeak_2.2.1.tgz"; + path = fetchurl { + name = "jackspeak___jackspeak_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz"; + sha512 = "MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw=="; + }; + } + { + name = "jake___jake_10.8.7.tgz"; path = fetchurl { - name = "jake___jake_10.8.5.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; - sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; + name = "jake___jake_10.8.7.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz"; + sha512 = "ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w=="; }; } { @@ -1514,11 +1930,11 @@ }; } { - name = "keyv___keyv_4.5.2.tgz"; + name = "keyv___keyv_4.5.3.tgz"; path = fetchurl { - name = "keyv___keyv_4.5.2.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; - sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; + name = "keyv___keyv_4.5.3.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz"; + sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; }; } { @@ -1530,6 +1946,14 @@ }; } { + 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"; + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; + }; + } + { name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; @@ -1546,6 +1970,14 @@ }; } { + name = "log_symbols___log_symbols_4.1.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + } + { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; @@ -1562,6 +1994,30 @@ }; } { + name = "lru_cache___lru_cache_7.18.3.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.18.3.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; + }; + } + { + name = "lru_cache___lru_cache_10.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz"; + sha512 = "svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw=="; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_11.1.1.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; + sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; + }; + } + { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; @@ -1594,6 +2050,14 @@ }; } { + 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"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + } + { name = "mimic_response___mimic_response_1.0.1.tgz"; path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; @@ -1610,14 +2074,6 @@ }; } { - 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"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - } - { name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { name = "minimatch___minimatch_3.1.2.tgz"; @@ -1634,11 +2090,59 @@ }; } { - name = "minimist___minimist_1.2.7.tgz"; + name = "minimatch___minimatch_9.0.3.tgz"; + path = fetchurl { + name = "minimatch___minimatch_9.0.3.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz"; + sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; + }; + } + { + name = "minimist___minimist_1.2.8.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; + }; + } + { + 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"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + } + { + name = "minipass_fetch___minipass_fetch_3.0.3.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + name = "minipass_fetch___minipass_fetch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz"; + sha512 = "n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ=="; + }; + } + { + 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"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + } + { + 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"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + } + { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + path = fetchurl { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; }; } { @@ -1650,11 +2154,19 @@ }; } { - name = "minipass___minipass_4.0.2.tgz"; + name = "minipass___minipass_5.0.0.tgz"; + path = fetchurl { + name = "minipass___minipass_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz"; + sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; + }; + } + { + name = "minipass___minipass_7.0.2.tgz"; path = fetchurl { - name = "minipass___minipass_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz"; - sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A=="; + name = "minipass___minipass_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz"; + sha512 = "eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA=="; }; } { @@ -1666,6 +2178,14 @@ }; } { + name = "mitt___mitt_3.0.0.tgz"; + path = fetchurl { + name = "mitt___mitt_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz"; + sha512 = "7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="; + }; + } + { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; @@ -1682,14 +2202,6 @@ }; } { - 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"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - } - { name = "ms___ms_2.1.2.tgz"; path = fetchurl { name = "ms___ms_2.1.2.tgz"; @@ -1698,6 +2210,14 @@ }; } { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + } + { name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; path = fetchurl { name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; @@ -1706,6 +2226,22 @@ }; } { + name = "negotiator___negotiator_0.6.3.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + } + { + name = "netmask___netmask_2.0.2.tgz"; + path = fetchurl { + name = "netmask___netmask_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz"; + sha512 = "dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="; + }; + } + { name = "nice_try___nice_try_1.0.5.tgz"; path = fetchurl { name = "nice_try___nice_try_1.0.5.tgz"; @@ -1714,11 +2250,11 @@ }; } { - name = "node_abi___node_abi_3.31.0.tgz"; + name = "node_abi___node_abi_3.45.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.31.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + name = "node_abi___node_abi_3.45.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz"; + sha512 = "iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ=="; }; } { @@ -1738,11 +2274,35 @@ }; } { - name = "node_fetch___node_fetch_2.6.7.tgz"; + name = "node_api_version___node_api_version_0.1.4.tgz"; + path = fetchurl { + name = "node_api_version___node_api_version_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz"; + sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; + }; + } + { + name = "node_fetch___node_fetch_2.6.12.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz"; + sha512 = "C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g=="; + }; + } + { + name = "node_gyp___node_gyp_9.4.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_9.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz"; + sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; + }; + } + { + name = "nopt___nopt_6.0.0.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.7.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; + name = "nopt___nopt_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz"; + sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; }; } { @@ -1762,6 +2322,14 @@ }; } { + name = "npmlog___npmlog_6.0.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + } + { name = "object_keys___object_keys_1.1.1.tgz"; path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; @@ -1778,6 +2346,30 @@ }; } { + 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"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + } + { + 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"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; + }; + } + { + name = "ora___ora_5.4.1.tgz"; + path = fetchurl { + name = "ora___ora_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + } + { name = "p_cancelable___p_cancelable_2.1.1.tgz"; path = fetchurl { name = "p_cancelable___p_cancelable_2.1.1.tgz"; @@ -1794,6 +2386,30 @@ }; } { + 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"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + } + { + name = "pac_proxy_agent___pac_proxy_agent_6.0.4.tgz"; + path = fetchurl { + name = "pac_proxy_agent___pac_proxy_agent_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-6.0.4.tgz"; + sha512 = "FbJYeusBOZNe6bmrC2/+r/HljwExryon16lNKEU82gWiwIPMCEktUPSEAcTkO9K3jd/YPGuX/azZel1ltmo6nQ=="; + }; + } + { + name = "pac_resolver___pac_resolver_6.0.2.tgz"; + path = fetchurl { + name = "pac_resolver___pac_resolver_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-6.0.2.tgz"; + sha512 = "EQpuJ2ifOjpZY5sg1Q1ZeAxvtLwR7Mj3RgY8cysPGbsRu3RBXyJFWxnMus9PScjxya/0LzvVDxNh/gl0eXBU4w=="; + }; + } + { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; @@ -1834,6 +2450,14 @@ }; } { + name = "path_scurry___path_scurry_1.10.1.tgz"; + path = fetchurl { + name = "path_scurry___path_scurry_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz"; + sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; + }; + } + { name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { name = "path_type___path_type_4.0.0.tgz"; @@ -1850,11 +2474,11 @@ }; } { - name = "plist___plist_3.0.6.tgz"; + name = "plist___plist_3.1.0.tgz"; path = fetchurl { - name = "plist___plist_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz"; - sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA=="; + name = "plist___plist_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz"; + sha512 = "uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="; }; } { @@ -1866,6 +2490,14 @@ }; } { + 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"; + sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; + }; + } + { name = "progress___progress_2.0.3.tgz"; path = fetchurl { name = "progress___progress_2.0.3.tgz"; @@ -1874,6 +2506,22 @@ }; } { + name = "promise_retry___promise_retry_2.0.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + } + { + name = "proxy_agent___proxy_agent_6.2.1.tgz"; + path = fetchurl { + name = "proxy_agent___proxy_agent_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.2.1.tgz"; + sha512 = "OIbBKlRAT+ycCm6wAYIzMwPejzRtjy8F3QiDX0eKOA3e4pe3U9F/IvzcHP42bmgQxVv97juG+J8/gx+JIeCX/Q=="; + }; + } + { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; @@ -1898,19 +2546,19 @@ }; } { - name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; + name = "puppeteer_core___puppeteer_core_20.5.0.tgz"; path = fetchurl { - name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz"; - sha512 = "gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ=="; + name = "puppeteer_core___puppeteer_core_20.5.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-20.5.0.tgz"; + sha512 = "9ddHXUQ7jpliGei87zYTuEZYQvFj6Lzk5R8w4vT4gMmNArkEqC5CX72TnVIJiTUbiTpOXJkvMQaXIHYopjdUtQ=="; }; } { - name = "puppeteer___puppeteer_19.4.0.tgz"; + name = "puppeteer___puppeteer_20.5.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_19.4.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz"; - sha512 = "sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg=="; + name = "puppeteer___puppeteer_20.5.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-20.5.0.tgz"; + sha512 = "3j0JShJGDT5z8rfDKf+wZQq3IHxw7JaDAdP7py5H5zOIgmqNG0e8R19y4tFzJ8i2WC4H/0bC51rIrTXyDop1FA=="; }; } { @@ -1930,19 +2578,19 @@ }; } { - name = "read_config_file___read_config_file_6.2.0.tgz"; + name = "read_config_file___read_config_file_6.3.2.tgz"; path = fetchurl { - name = "read_config_file___read_config_file_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; + name = "read_config_file___read_config_file_6.3.2.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz"; + sha512 = "M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q=="; }; } { - name = "readable_stream___readable_stream_3.6.0.tgz"; + name = "readable_stream___readable_stream_3.6.2.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"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + name = "readable_stream___readable_stream_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; } { @@ -1978,6 +2626,22 @@ }; } { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + } + { + 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"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; + }; + } + { name = "rimraf___rimraf_3.0.2.tgz"; path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; @@ -2034,27 +2698,27 @@ }; } { - name = "semver___semver_5.7.1.tgz"; + name = "semver___semver_5.7.2.tgz"; path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + name = "semver___semver_5.7.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz"; + sha512 = "cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="; }; } { - name = "semver___semver_6.3.0.tgz"; + name = "semver___semver_6.3.1.tgz"; path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + name = "semver___semver_6.3.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz"; + sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; } { - name = "semver___semver_7.3.8.tgz"; + name = "semver___semver_7.5.4.tgz"; path = fetchurl { - name = "semver___semver_7.3.8.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + name = "semver___semver_7.5.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz"; + sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; }; } { @@ -2074,6 +2738,14 @@ }; } { + 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"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; + }; + } + { name = "shebang_command___shebang_command_1.2.0.tgz"; path = fetchurl { name = "shebang_command___shebang_command_1.2.0.tgz"; @@ -2114,6 +2786,14 @@ }; } { + name = "signal_exit___signal_exit_4.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz"; + sha512 = "MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q=="; + }; + } + { name = "simple_concat___simple_concat_1.0.1.tgz"; path = fetchurl { name = "simple_concat___simple_concat_1.0.1.tgz"; @@ -2154,6 +2834,30 @@ }; } { + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_8.0.1.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz"; + sha512 = "59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ=="; + }; + } + { + name = "socks___socks_2.7.1.tgz"; + path = fetchurl { + name = "socks___socks_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + }; + } + { name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { name = "source_map_support___source_map_support_0.5.21.tgz"; @@ -2178,6 +2882,14 @@ }; } { + name = "ssri___ssri_10.0.4.tgz"; + path = fetchurl { + name = "ssri___ssri_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz"; + sha512 = "12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ=="; + }; + } + { name = "stat_mode___stat_mode_1.0.0.tgz"; path = fetchurl { name = "stat_mode___stat_mode_1.0.0.tgz"; @@ -2194,6 +2906,14 @@ }; } { + name = "string_width___string_width_5.1.2.tgz"; + path = fetchurl { + name = "string_width___string_width_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; + }; + } + { name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; @@ -2210,6 +2930,14 @@ }; } { + name = "strip_ansi___strip_ansi_7.1.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz"; + sha512 = "iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="; + }; + } + { name = "strip_eof___strip_eof_1.0.0.tgz"; path = fetchurl { name = "strip_eof___strip_eof_1.0.0.tgz"; @@ -2266,11 +2994,11 @@ }; } { - name = "tar___tar_6.1.13.tgz"; + name = "tar___tar_6.1.15.tgz"; path = fetchurl { - name = "tar___tar_6.1.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; + name = "tar___tar_6.1.15.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz"; + sha512 = "/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="; }; } { @@ -2322,6 +3050,14 @@ }; } { + name = "tslib___tslib_2.6.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz"; + sha512 = "7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="; + }; + } + { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; @@ -2330,6 +3066,14 @@ }; } { + 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"; + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; + }; + } + { name = "type_fest___type_fest_0.13.1.tgz"; path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; @@ -2338,6 +3082,14 @@ }; } { + name = "typescript___typescript_4.9.5.tgz"; + path = fetchurl { + name = "typescript___typescript_4.9.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; + }; + } + { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; @@ -2346,6 +3098,22 @@ }; } { + name = "unique_filename___unique_filename_3.0.0.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz"; + sha512 = "afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g=="; + }; + } + { + name = "unique_slug___unique_slug_4.0.0.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz"; + sha512 = "WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ=="; + }; + } + { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; @@ -2394,6 +3162,22 @@ }; } { + name = "vm2___vm2_3.9.19.tgz"; + path = fetchurl { + name = "vm2___vm2_3.9.19.tgz"; + url = "https://registry.yarnpkg.com/vm2/-/vm2-3.9.19.tgz"; + sha512 = "J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg=="; + }; + } + { + name = "wcwidth___wcwidth_1.0.1.tgz"; + path = fetchurl { + name = "wcwidth___wcwidth_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; + sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; + }; + } + { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; @@ -2426,6 +3210,22 @@ }; } { + name = "wide_align___wide_align_1.1.5.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; + }; + } + { + name = "word_wrap___word_wrap_1.2.5.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz"; + sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="; + }; + } + { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; @@ -2434,6 +3234,14 @@ }; } { + name = "wrap_ansi___wrap_ansi_8.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; + }; + } + { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; @@ -2442,11 +3250,11 @@ }; } { - name = "ws___ws_8.10.0.tgz"; + name = "ws___ws_8.13.0.tgz"; path = fetchurl { - name = "ws___ws_8.10.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz"; - sha512 = "+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw=="; + name = "ws___ws_8.13.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz"; + sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; } { @@ -2482,11 +3290,19 @@ }; } { - name = "yargs___yargs_17.6.2.tgz"; + name = "yargs___yargs_17.7.1.tgz"; + path = fetchurl { + name = "yargs___yargs_17.7.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz"; + sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; + }; + } + { + name = "yargs___yargs_17.7.2.tgz"; path = fetchurl { - name = "yargs___yargs_17.6.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; - sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; + name = "yargs___yargs_17.7.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz"; + sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; }; } { diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index c8d3df4e2b2..8b5d8d9e14f 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib udev libusb1 cups python3Packages.python - libnotify gobject-introspection gdk-pixbuf pango atk packagekit + libnotify gdk-pixbuf pango atk packagekit libsecret ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { intltool pkg-config xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython - wrapGAppsHook autoreconfHook + wrapGAppsHook autoreconfHook gobject-introspection ]; pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index a01ee6bb86d..f900eafaacd 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "12.0.1"; + version = "12.0.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-H+Vx5yfHKgiUCrk42PMlu+XQsehol6aBLSwCuiBWCrs="; + hash = "sha256-PfrtTegJULzPAmKUk/6P9rD+ttPJOhaf2505og64C0Y="; }; - cargoHash = "sha256-ixFTkTyPKLeH6VcFAOAwmdc6YrrIpJ8obBwm19tFq3s="; + cargoHash = "sha256-S6jSI/KuHocYD2dhg3o1NSyA8Q04Xo215TWl8Y1C7g8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/tools/misc/twspace-crawler/default.nix index a098d1af9ab..693bd8794e0 100644 --- a/pkgs/tools/misc/twspace-crawler/default.nix +++ b/pkgs/tools/misc/twspace-crawler/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "twspace-crawler"; - version = "1.12.4"; + version = "1.12.6"; src = fetchFromGitHub { owner = "HitomaruKonpaku"; repo = "twspace-crawler"; - rev = "339972a785a4074880a66be4ca4063e6b47ddfaa"; # version not tagged - hash = "sha256-YJXvBKvZ/Z1mRf6MW3JFqlK77+N+JM3OZZNSJyaaic4="; + rev = "fc415f4b889f93bdbf357e14f1a6bf3fc146aac9"; # version not tagged + hash = "sha256-25/VFbf6UJJKnDDCXuIfWSEgVD24SB3feLV0zF8DlBs="; }; - npmDepsHash = "sha256-eVh+1pBAxB+tgS6b8Bd3gtxUK887djbZVVC4wM/5zZk="; + npmDepsHash = "sha256-4ZNFuOCdCh+H8tH8qKr2569wDFPOxaLfqmA6N3FNP84="; meta = with lib; { description = "Script to monitor & download Twitter Spaces 24/7"; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 6ca25370778..95ffa8e8e4b 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-1EMSrHx6Tx58voz5veyNZg1gnubuGyg2K4dg2QdzmMw="; + sha256 = "sha256-5EUXhKv4cLDaHr6Q2mel3YbVPAYRJd1JtHyWn7kQy8Y="; }; - vendorHash = "sha256-0wHXULDKyXYBTGxfSQXT/5NidPtSnx7ujb8vyczmE38="; + vendorHash = "sha256-rwQeIHJAtnRm5nPQCvgoBabVeyLZyrY3yglCW9+NGwM="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/tools/misc/wasm-tools/Cargo.lock b/pkgs/tools/misc/wasm-tools/Cargo.lock index ff19090b8a7..53d0877bac8 100644 --- a/pkgs/tools/misc/wasm-tools/Cargo.lock +++ b/pkgs/tools/misc/wasm-tools/Cargo.lock @@ -235,9 +235,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.16" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -246,9 +246,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.16" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -580,9 +580,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" @@ -643,12 +643,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fixedbitset" @@ -856,17 +853,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "is-terminal" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -956,12 +942,6 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" @@ -1025,9 +1005,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -1174,9 +1154,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1297,7 +1277,7 @@ checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f" dependencies = [ "bitflags 1.3.2", "errno 0.2.8", - "io-lifetimes 0.7.5", + "io-lifetimes", "libc", "linux-raw-sys 0.0.46", "windows-sys 0.42.0", @@ -1305,20 +1285,6 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" @@ -1370,9 +1336,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] @@ -1389,9 +1355,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", @@ -1400,9 +1366,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -1411,9 +1377,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.24" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5f51e3fdb5b9cdd1577e1cb7a733474191b1aca6a72c2e50913241632c1180" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ "indexmap 2.0.0", "itoa", @@ -1475,9 +1441,9 @@ checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" [[package]] name = "syn" -version = "2.0.26" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1492,15 +1458,14 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", - "rustix 0.37.23", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -1524,18 +1489,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", @@ -1726,10 +1691,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-compose" -version = "0.3.1" +version = "0.4.0" dependencies = [ "anyhow", - "clap 4.3.16", "glob", "heck", "indexmap 2.0.0", @@ -1740,7 +1704,7 @@ dependencies = [ "serde_yaml", "smallvec", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", "wit-component", @@ -1748,42 +1712,42 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.31.0" +version = "0.31.1" dependencies = [ "anyhow", "leb128", "tempfile", - "wasmparser 0.109.0", + "wasmparser 0.110.0", ] [[package]] name = "wasm-metadata" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", - "clap 4.3.16", + "clap 4.3.19", "indexmap 2.0.0", "serde", "serde_json", "spdx", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wat", ] [[package]] name = "wasm-mutate" -version = "0.2.29" +version = "0.2.30" dependencies = [ "anyhow", - "clap 4.3.16", + "clap 4.3.19", "egg", "env_logger", "log", "rand", "thiserror", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] @@ -1794,37 +1758,37 @@ version = "0.1.0" dependencies = [ "anyhow", "arbitrary", - "clap 4.3.16", + "clap 4.3.19", "env_logger", "itertools", "log", "num_cpus", "rand", "wasm-mutate", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wasmtime", ] [[package]] name = "wasm-shrink" -version = "0.1.30" +version = "0.1.31" dependencies = [ "anyhow", "blake3", - "clap 4.3.16", + "clap 4.3.19", "env_logger", "log", "rand", "wasm-mutate", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] [[package]] name = "wasm-smith" -version = "0.12.12" +version = "0.12.13" dependencies = [ "arbitrary", "criterion", @@ -1835,19 +1799,19 @@ dependencies = [ "rand", "serde", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] [[package]] name = "wasm-tools" -version = "1.0.37" +version = "1.0.38" dependencies = [ "addr2line 0.20.0", "anyhow", "arbitrary", - "clap 4.3.16", + "clap 4.3.19", "cpp_demangle 0.4.2", "diff", "env_logger", @@ -1868,7 +1832,7 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wast", "wat", @@ -1885,7 +1849,7 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wast", "wat", @@ -1904,7 +1868,7 @@ dependencies = [ "wasm-encoder", "wasm-mutate", "wasm-smith", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wasmtime", "wast", @@ -1925,7 +1889,7 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.109.0" +version = "0.110.0" dependencies = [ "anyhow", "criterion", @@ -1940,13 +1904,13 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.61" +version = "0.2.62" dependencies = [ "anyhow", "diff", "rayon", "tempfile", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wast", "wat", ] @@ -2108,7 +2072,7 @@ dependencies = [ [[package]] name = "wast" -version = "62.0.0" +version = "62.0.1" dependencies = [ "anyhow", "leb128", @@ -2116,13 +2080,13 @@ dependencies = [ "rayon", "unicode-width", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wat", ] [[package]] name = "wat" -version = "1.0.68" +version = "1.0.69" dependencies = [ "wast", ] @@ -2336,7 +2300,7 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "wit-component" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "bitflags 2.3.3", @@ -2347,7 +2311,7 @@ dependencies = [ "pretty_assertions", "wasm-encoder", "wasm-metadata", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", "wit-parser", @@ -2355,7 +2319,7 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "env_logger", @@ -2384,10 +2348,10 @@ dependencies = [ [[package]] name = "wit-smith" -version = "0.1.7" +version = "0.1.8" dependencies = [ "arbitrary", - "clap 4.3.16", + "clap 4.3.19", "indexmap 2.0.0", "log", "semver", diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 24ed77fdd53..6572b7469f3 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.37"; + version = "1.0.38"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-3LswpSnXCRaDeoViEa/EnyB472g4TlLYc705rUmfN9M="; + hash = "sha256-SGNIGOpkREGu/bmojOh+TPlg75rKoa04u+BDiida6dI="; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 7403f733924..1855fa53413 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; - rev = "v${version}"; - hash = "sha256-c5LHF8SPvBqXpz5mRIKU402ZeCs8VUzPIwLoMPrWzdA="; + rev = "refs/tags/v${version}"; + hash = "sha256-KzMpe6pSPCNlk4fhZUZ1dvcj2Vgk8gHbEhVwlxOFKFg="; }; - vendorHash = "sha256-4Ml9qiaXf2zBIDdJE7JWHf684YD1yuIPd4VTRcBNLcE="; + vendorHash = "sha256-YdHJMUgVNUAREmvBDQl8p5ESOmJykheaQSU6asyZ7qc="; outputs = [ "out" diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 216d27eb4e1..6c972bb2397 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, openssl, c-ares, libxml2, sqlite, zlib, libssh2 +, gnutls, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; - buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ + buildInputs = [ gnutls c-ares libxml2 sqlite zlib libssh2 ] ++ lib.optional stdenv.isDarwin Security; outputs = [ "bin" "dev" "out" "doc" "man" ]; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 6e8c7669f0d..64f6cc4eca4 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "babeld"; - version = "1.12.2"; + version = "1.13.1"; src = fetchurl { url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz"; - hash = "sha256-HbIrYZMHDqJFChq1EZb9cvWKEyn3gMsDiOLksud2jLs="; + hash = "sha256-FfJNJtoMz8Bzq83vAwnygeRoTyqnESb4JlcsTIRejdk="; }; outputs = [ diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index a66d8a07426..8a23a5f8bd5 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.13.0"; + version = "0.13.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-nz3b5EMuzZgwqh1guSyOuSqwmZpPOhY6jb/7CL65Q7c="; - aarch64-linux = "sha256-fyYdm5E9iuGcs6TxrwbbCC7/NU9p35T/2nEOdv7yU9k="; - x86_64-darwin = "sha256-xx16xCghd6t9BYrQAYqJTVdrS2G8qNQ5l4gG9SfDwRI="; - aarch64-darwin = "sha256-z/aHLRqybf7UiZue608VYDlKdIenEVVmMdd/XvIzXsc="; + x86_64-linux = "sha256-SrBfZ0te1l5XDmI8euojpVVRHxqq+T1WDSVbberxJYs="; + aarch64-linux = "sha256-T0t1E8lZMJZVanG7NZh9O+1RwzH82HtGi1ytDYYslhE="; + x86_64-darwin = "sha256-Wmk2hRbRe0dOuPnwISpsh2om1khpE3sX65VfWLYXNFk="; + aarch64-darwin = "sha256-ccfAtuqZSaQG4rCQZ4ujtFhp1e6dsrMAUcRuHT+YqXU="; }; in fetchzip { diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/tools/networking/cdpr/default.nix index 6879b7e9d70..1f9e7b1888d 100644 --- a/pkgs/tools/networking/cdpr/default.nix +++ b/pkgs/tools/networking/cdpr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libpcap }: +{ lib, stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { pname = "cdpr"; diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch index 3be4c273b3b..2c732621d92 100644 --- a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -27,10 +27,10 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac. curl_includes_winsock2="\ diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index 99048c489..19abfbbac 100644 +index 727d123e5..f78d8be4a 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h -@@ -247,19 +247,6 @@ +@@ -250,19 +250,6 @@ #include <curl/system.h> @@ -42,7 +42,7 @@ index 99048c489..19abfbbac 100644 -#if defined(__APPLE__) && !defined(USE_ARES) -#include <TargetConditionals.h> -#define USE_RESOLVE_ON_IPS 1 --# if defined(TARGET_OS_OSX) && TARGET_OS_OSX +-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX -# define CURL_OSX_CALL_COPYPROXIES 1 -# endif -#endif diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index fd5ad84abf6..11698bf2591 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.1.2"; + version = "8.2.1"; src = fetchurl { urls = [ - "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" - "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" + "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" + "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-tUl00y/WEKys6S498fZDFEAVrGWEfwoEH9wX229D8kM="; + hash = "sha256-3TIva9CiDmzr39OI9p6Yw9GDvteSz0cTyKfvSYy6SJQ="; }; patches = [ diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 757a7208c4d..1d07843cc48 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index f4398cdd039..8ca5199838e 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, nettle, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, nettle , libidn, libnetfilter_conntrack, buildPackages , dbusSupport ? stdenv.isLinux , dbus diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 24e1ef29ef3..ae663abb08d 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -13,14 +13,14 @@ let */ staticdb = symlinkJoin { inherit (db) name; - paths = with db.overrideAttrs(old: { dontDisableStatic = true; }); [ out dev ]; + paths = with db.overrideAttrs { dontDisableStatic = true; }; [ out dev ]; postBuild = '' rm $out/lib/*.so* ''; }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ]; + paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ]; postBuild = '' cp -rs $out/include/pcap $out/include/net # prevent references to libpcap @@ -29,15 +29,15 @@ let }; net = symlinkJoin { inherit (libnet) name; - paths = [ (libnet.overrideAttrs(old: { dontDisableStatic = true; })) ]; + paths = [ (libnet.overrideAttrs { dontDisableStatic = true; }) ]; postBuild = '' # prevent dynamic linking, now that we have a static library rm $out/lib/*.so* ''; }; - nids = libnids.overrideAttrs(old: { + nids = libnids.overrideAttrs { dontDisableStatic = true; - }); + }; ssl = symlinkJoin { inherit (openssl) name; paths = with openssl.override { static = true; }; [ out dev ]; diff --git a/pkgs/tools/networking/ebpf-verifier/default.nix b/pkgs/tools/networking/ebpf-verifier/default.nix index 63af32ce1a2..972c72c4e57 100644 --- a/pkgs/tools/networking/ebpf-verifier/default.nix +++ b/pkgs/tools/networking/ebpf-verifier/default.nix @@ -9,7 +9,7 @@ , yaml-cpp }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "ebpf-verifier"; version = "unstable-2023-07-15"; @@ -57,4 +57,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; maintainers = with maintainers; [ gaelreyrol ]; }; -}) +} diff --git a/pkgs/tools/networking/edgedb/Cargo.lock b/pkgs/tools/networking/edgedb/Cargo.lock index 24adf272e63..bc9f1a891c3 100644 --- a/pkgs/tools/networking/edgedb/Cargo.lock +++ b/pkgs/tools/networking/edgedb/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -24,106 +24,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - -[[package]] name = "aes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", -] - -[[package]] -name = "aes" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ - "cfg-if 1.0.0", - "cipher 0.3.0", + "cfg-if", + "cipher", "cpufeatures", - "opaque-debug", ] [[package]] -name = "aes-gcm" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" -dependencies = [ - "aead", - "aes 0.6.0", - "cipher 0.2.5", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" +name = "ahash" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "cipher 0.2.5", - "opaque-debug", + "getrandom", + "once_cell", + "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] -name = "anyhow" -version = "1.0.59" +name = "anstyle" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] -name = "anymap" -version = "0.12.1" +name = "anyhow" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arc-swap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayref" @@ -133,43 +86,30 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "assert_cmd" -version = "1.0.1" -source = "git+https://github.com/tailhook/assert_cmd?branch=edgedb_20190513#062308b405aaa36240a80c07fec520768b628035" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ + "anstyle", + "bstr", "doc-comment", - "predicates 1.0.8", + "predicates 3.0.3", "predicates-core", "predicates-tree", "wait-timeout", ] [[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn", -] - -[[package]] name = "async-channel" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", @@ -177,34 +117,24 @@ dependencies = [ ] [[package]] -name = "async-dup" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" -dependencies = [ - "futures-io", - "simple-mutex", -] - -[[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", "concurrent-queue", "fastrand", "futures-lite", - "once_cell", "slab", ] [[package]] name = "async-global-executor" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", @@ -212,43 +142,27 @@ dependencies = [ "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", ] [[package]] -name = "async-h1" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" -dependencies = [ - "async-channel", - "async-dup", - "async-std", - "futures-core", - "http-types", - "httparse", - "log", - "pin-project", -] - -[[package]] name = "async-io" -version = "1.7.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ + "async-lock", + "autocfg", "concurrent-queue", "futures-lite", "libc", "log", - "once_cell", "parking", "polling", "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -262,54 +176,23 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", ] [[package]] -name = "async-native-tls" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" -dependencies = [ - "async-std", - "native-tls", - "thiserror", - "url", -] - -[[package]] -name = "async-process" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" -dependencies = [ - "async-io", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", -] - -[[package]] name = "async-std" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-attributes", "async-channel", "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -334,20 +217,20 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "atty" @@ -368,13 +251,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -382,10 +265,10 @@ dependencies = [ ] [[package]] -name = "base-x" -version = "0.2.11" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base32" @@ -395,9 +278,15 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -406,10 +295,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" [[package]] +name = "basic-toml" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1" +dependencies = [ + "serde", +] + +[[package]] name = "bigdecimal" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" +checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ "num-bigint", "num-integer", @@ -423,67 +321,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake2b_simd" -version = "1.0.0" +name = "bitflags" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "arrayref", - "arrayvec 0.7.2", - "constant_time_eq", + "funty", + "radium", + "tap", + "wyz", ] [[package]] -name = "blake3" -version = "1.3.1" +name = "blake2b_simd" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "cc", - "cfg-if 1.0.0", - "constant_time_eq", - "digest 0.10.3", + "arrayvec", + "constant_time_eq 0.2.4", ] [[package]] -name = "block-buffer" -version = "0.9.0" +name = "blake3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" dependencies = [ - "generic-array", + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq 0.2.4", + "digest", ] [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", +] + +[[package]] +name = "bstr" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +dependencies = [ + "memchr", "once_cell", + "regex-automata", + "serde", ] [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -493,15 +412,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -519,78 +438,55 @@ dependencies = [ ] [[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - -[[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] [[package]] name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ - "libc", - "num-integer", + "android-tzdata", "num-traits", - "time 0.1.44", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", - "textwrap 0.16.0", + "textwrap", ] [[package]] @@ -604,15 +500,15 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -658,82 +554,59 @@ dependencies = [ [[package]] name = "colorful" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bca1619ff57dd7a56b58a8e25ef4199f123e78e503fe1653410350a1b98ae65" +checksum = "97af0562545a7d7f3d9222fcf909963bec36dcb502afaacab98c6ffac8da47ce" [[package]] name = "combine" -version = "4.6.4" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes", "memchr", ] [[package]] -name = "concurrent-queue" -version = "1.2.4" +name = "comma" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] -name = "config" -version = "0.10.1" +name = "concurrent-queue" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ - "lazy_static", - "nom", - "serde", + "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.1" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode 0.3.6", + "lazy_static", "libc", - "once_cell", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] [[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "cookie" -version = "0.14.4" +name = "constant_time_eq" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "aes-gcm", - "base64", - "hkdf", - "hmac 0.10.1", - "percent-encoding", - "rand 0.8.5", - "sha2 0.9.9", - "time 0.2.27", - "version_check", -] +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" [[package]] name = "coolor" @@ -762,18 +635,18 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] [[package]] -name = "cpuid-bool" -version = "0.2.0" +name = "crc16" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" [[package]] name = "crc32fast" @@ -781,7 +654,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -790,7 +663,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -800,57 +673,55 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset", - "once_cell", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", - "once_cell", + "cfg-if", ] [[package]] @@ -859,7 +730,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -889,68 +760,23 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", -] - -[[package]] -name = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ - "cipher 0.2.5", + "syn 1.0.109", ] [[package]] name = "ctrlc" -version = "3.2.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" +checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ - "nix 0.24.2", - "winapi", -] - -[[package]] -name = "dashmap" -version = "5.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "deadpool" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d" -dependencies = [ - "async-trait", - "config", - "crossbeam-queue", - "num_cpus", - "serde", - "tokio", + "nix", + "windows-sys 0.48.0", ] [[package]] @@ -960,12 +786,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] name = "difflib" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -973,31 +793,31 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.9.0" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "generic-array", + "block-buffer", + "crypto-common", + "subtle", ] [[package]] -name = "digest" -version = "0.10.3" +name = "dirs" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "block-buffer 0.10.2", - "crypto-common", - "subtle", + "dirs-sys 0.3.7", ] [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", ] [[package]] @@ -1006,7 +826,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1022,6 +842,18 @@ dependencies = [ ] [[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1033,10 +865,10 @@ dependencies = [ ] [[package]] -name = "discard" -version = "1.0.4" +name = "dissimilar" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e" [[package]] name = "doc-comment" @@ -1052,23 +884,19 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "edgedb-cli" -version = "2.3.1" +version = "3.3.0" dependencies = [ "anyhow", - "anymap", "arc-swap", "assert_cmd", "async-listen", - "async-process", - "async-std", - "atty", "backtrace", "base32", - "base64", + "base64 0.13.1", "bigdecimal", + "bitvec", "blake2b_simd", "blake3", - "blocking", "bytes", "chrono", "clap", @@ -1080,90 +908,93 @@ dependencies = [ "crossbeam-utils", "crossterm", "ctrlc", - "difference", - "dirs", + "dirs 4.0.0", + "dissimilar", "downcast-rs", "edgedb-cli-derive", - "edgedb-client", "edgedb-derive", + "edgedb-errors", "edgedb-protocol", + "edgedb-tokio", "edgeql-parser", - "env_logger 0.9.0", - "fd-lock 3.0.6", + "env_logger 0.10.0", + "fd-lock 3.0.12", "fn-error-context", "fs-err", - "futures", "futures-util", + "gethostname", "hex", "humantime 2.1.0", "humantime-serde", "immutable-chunkmap", + "indexmap 2.0.0-pre", "indicatif", + "is-terminal", "libc", "libflate", - "linked-hash-map", "log", "minimad", "native-tls", - "nix 0.24.2", + "nix", + "notify", "num-bigint", "once_cell", "open", "openssl", "os-release", - "pem 1.1.0", - "predicates 2.1.1", + "pem 1.1.1", + "predicates 2.1.5", "pretty_assertions", "prettytable-rs", - "rand 0.8.5", + "rand", "regex", "reqwest", "rexpect", "ring", "rpassword", - "rustls 0.20.6", + "rustls", "rustyline", "scram", - "semver 1.0.13", + "semver", "serde", "serde_json", "serde_millis", "serde_path_to_error", "serde_str", - "sha1 0.10.1", - "sha2 0.10.2", + "sha1", + "sha2", "shell-escape", "shutdown_hooks", - "signal", "signal-hook", "snafu", "strsim", - "surf", "tar", "tempfile", "term", - "term_size", "termcolor", "termimad", + "terminal_size", "test-case", - "textwrap 0.15.0", + "textwrap", "thiserror", "tokio", + "tokio-stream", "toml", "unicode-segmentation", + "unicode-width", "url", "urlencoding", "uuid", "wait-timeout", "warp", - "webpki 0.22.0", + "webpki", "which", "whoami", "winapi", "winreg", "wslapi", "zip", - "zstd", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] @@ -1173,74 +1004,41 @@ dependencies = [ "clap", "clap_generate", "heck", - "linked-hash-map", + "indexmap 1.9.3", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "termimad", "trybuild", ] [[package]] -name = "edgedb-client" -version = "0.3.0" -dependencies = [ - "anyhow", - "async-std", - "async-trait", - "bytes", - "dirs", - "edgedb-derive", - "edgedb-errors", - "edgedb-protocol", - "env_logger 0.9.0", - "futures-util", - "log", - "rand 0.8.5", - "rustls 0.20.6", - "rustls-native-certs", - "rustls-pemfile 0.3.0", - "scram", - "serde", - "serde_json", - "sha1 0.10.1", - "snafu", - "tls-api", - "tls-api-not-tls", - "tls-api-rustls", - "typemap", - "url", - "webpki 0.22.0", - "webpki-roots", -] - -[[package]] name = "edgedb-derive" -version = "0.4.0" -source = "git+https://github.com/edgedb/edgedb-rust#fe0af0edd3ab2fd075d9159857ebebec5573cbed" +version = "0.5.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", "trybuild", ] [[package]] name = "edgedb-errors" -version = "0.3.0" -source = "git+https://github.com/edgedb/edgedb-rust#fe0af0edd3ab2fd075d9159857ebebec5573cbed" +version = "0.4.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" dependencies = [ "bytes", ] [[package]] name = "edgedb-protocol" -version = "0.4.0" -source = "git+https://github.com/edgedb/edgedb-rust#fe0af0edd3ab2fd075d9159857ebebec5573cbed" +version = "0.5.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" dependencies = [ "bigdecimal", - "bitflags", + "bitflags 2.3.1", "bytes", "chrono", "edgedb-errors", @@ -1251,24 +1049,60 @@ dependencies = [ ] [[package]] +name = "edgedb-tokio" +version = "0.4.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" +dependencies = [ + "anyhow", + "arc-swap", + "async-trait", + "base16ct", + "base64 0.21.2", + "bytes", + "crc16", + "dirs 5.0.1", + "edgedb-derive", + "edgedb-errors", + "edgedb-protocol", + "log", + "once_cell", + "rand", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "scram", + "serde", + "serde_json", + "sha1", + "tls-api", + "tls-api-not-tls", + "tls-api-rustls", + "tokio", + "tokio-stream", + "url", + "webpki", + "webpki-roots", +] + +[[package]] name = "edgeql-parser" version = "0.1.0" -source = "git+https://github.com/edgedb/edgedb#168891d7e8320acb87075d0518eec32f29964619" +source = "git+https://github.com/edgedb/edgedb#68033e0256a9c4f214ec1b2042817d8e235f56ec" dependencies = [ "base32", "combine", - "sha2 0.10.2", + "memchr", + "sha2", "snafu", "thiserror", - "twoway", "unicode-width", ] [[package]] name = "either" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1284,11 +1118,11 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1312,12 +1146,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime 2.1.0", + "is-terminal", "log", "regex", "termcolor", @@ -1325,13 +1159,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1345,16 +1179,6 @@ dependencies = [ ] [[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1362,9 +1186,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1381,32 +1205,32 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.6" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517" +checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ - "cfg-if 1.0.0", - "rustix 0.35.7", - "windows-sys 0.36.1", + "cfg-if", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.36.1", + "redox_syscall 0.2.16", + "windows-sys 0.45.0", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -1423,13 +1247,13 @@ dependencies = [ [[package]] name = "fn-error-context" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236b4e4ae2b8be5f7a5652f6108c4a0f2627c569db4e7923333d31c7dbfed0fb" +checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -1455,46 +1279,39 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fs-err" -version = "2.7.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" [[package]] -name = "fuchsia-cprng" -version = "0.1.1" +name = "fsevent-sys" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] [[package]] -name = "futures" -version = "0.3.21" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -1502,26 +1319,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -1540,40 +1346,37 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1590,54 +1393,43 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "gethostname" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ - "cfg-if 1.0.0", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "windows-targets 0.48.0", ] [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" -dependencies = [ - "opaque-debug", - "polyval", + "wasi", ] [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ "futures-channel", "futures-core", @@ -1647,9 +1439,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.13" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1657,10 +1449,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util", "tracing", ] @@ -1669,21 +1461,30 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "headers" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", - "bitflags", + "base64 0.13.1", + "bitflags 1.3.2", "bytes", "headers-core", "http", "httpdate", "mime", - "sha-1", + "sha1", ] [[package]] @@ -1697,9 +1498,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1712,6 +1513,15 @@ dependencies = [ [[package]] name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" @@ -1726,39 +1536,19 @@ dependencies = [ ] [[package]] -name = "hkdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" -dependencies = [ - "digest 0.9.0", - "hmac 0.10.1", -] - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - -[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1777,50 +1567,10 @@ dependencies = [ ] [[package]] -name = "http-client" -version = "6.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" -dependencies = [ - "async-h1", - "async-native-tls", - "async-std", - "async-trait", - "cfg-if 1.0.0", - "dashmap", - "deadpool", - "futures", - "http-types", - "log", -] - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "async-std", - "base64", - "cookie", - "futures-lite", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - -[[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1855,9 +1605,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -1892,73 +1642,100 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "immutable-chunkmap" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4935d692a73e65f929e34b6b801bbc158647a017882c2c28624d121a1a1162" +checksum = "7617eb072b88069788fa9d5cadae34faebca64e5325ec5deaa2b4c96510f9e8c" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "packed_struct", "packed_struct_codegen", ] [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0-pre" +source = "git+https://github.com/bluss/indexmap?rev=11ac52c#11ac52c3c828a42d69c5fb3248198511836bfd2f" +dependencies = [ + "hashbrown 0.13.2", + "serde", ] [[package]] name = "indicatif" -version = "0.17.0" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" dependencies = [ "console", + "instant", "number_prefix", + "portable-atomic", "unicode-width", ] [[package]] -name = "infer" -version = "0.2.3" +name = "inotify" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] [[package]] -name = "instant" -version = "0.1.12" +name = "inotify-sys" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" dependencies = [ - "cfg-if 1.0.0", + "libc", ] [[package]] -name = "io-lifetimes" -version = "0.7.2" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" dependencies = [ "libc", "windows-sys 0.45.0", @@ -1966,56 +1743,76 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.5", - "rustix 0.36.8", - "windows-sys 0.45.0", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] +name = "kqueue" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] name = "kv-log-macro" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2031,29 +1828,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec 0.5.2", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - -[[package]] name = "libc" -version = "0.2.139" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libflate" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -2062,39 +1846,24 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ "rle-decode-fast", ] [[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -dependencies = [ - "serde", -] - -[[package]] name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -2102,21 +1871,14 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" dependencies = [ - "cfg-if 1.0.0", "value-bag", ] [[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2124,9 +1886,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -2149,45 +1920,45 @@ dependencies = [ [[package]] name = "minidl" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea5c42a75297faf23962781d2bb23caaf2ede8fd7337842fef63ee3ffdca5c9" +checksum = "87d3d8666e5ed22230c0096edcccf7097905b1e2975869e1b9fe5df40d26d801" [[package]] name = "minimad" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd37b2e65fbd459544194d8f52ed84027e031684335a062c708774c09d172b0b" +checksum = "277639f0198568f70f8fe4ab88a52a67c96bca12f27ba5c17a76acdcb8b45834" dependencies = [ "once_cell", ] [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", + "wasi", + "windows-sys 0.45.0", ] [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2212,59 +1983,43 @@ dependencies = [ [[package]] name = "nix" -version = "0.14.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", + "bitflags 1.3.2", + "cfg-if", "libc", - "void", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", ] [[package]] -name = "nix" -version = "0.20.0" +name = "normalize-line-endings" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] -name = "nix" -version = "0.24.2" +name = "notify" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", + "mio", + "walkdir", + "windows-sys 0.45.0", ] [[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] name = "num-bigint" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2296,20 +2051,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi 0.1.19", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ + "hermit-abi 0.2.6", "libc", ] @@ -2321,43 +2067,37 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.13.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "3.0.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23a407004a1033f53e93f9b45580d14de23928faad187384f891507c9b0c045" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ "pathdiff", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "openssl" -version = "0.10.41" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -2373,7 +2113,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2384,20 +2124,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "111.25.1+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.75" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -2406,6 +2145,12 @@ dependencies = [ ] [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "os-release" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2416,9 +2161,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "output_vt100" @@ -2431,23 +2176,23 @@ dependencies = [ [[package]] name = "packed_struct" -version = "0.6.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e1e99bfad1f9eb1d5d775ce5f73694a93178376b6dc34c30eddce6f1bcf5f2" +checksum = "36b29691432cc9eff8b282278473b63df73bea49bc3ec5e67f31a3ae9c3ec190" dependencies = [ + "bitvec", "packed_struct_codegen", - "serde", ] [[package]] name = "packed_struct_codegen" -version = "0.6.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8731210ac3e7bff5f86094b9f5b83a84d44965ce3e0b6c3ea827854a28d696c" +checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2468,25 +2213,25 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.36.1", + "windows-sys 0.45.0", ] [[package]] name = "password-hash" -version = "0.3.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core", "subtle", ] @@ -2498,14 +2243,14 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.3", - "hmac 0.12.1", + "digest", + "hmac", "password-hash", - "sha2 0.10.2", + "sha2", ] [[package]] @@ -2514,44 +2259,44 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ - "base64", + "base64 0.13.1", "once_cell", "regex", ] [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2568,75 +2313,75 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polling" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ - "cfg-if 1.0.0", + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] -name = "polyval" -version = "0.4.5" +name = "portable-atomic" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" -dependencies = [ - "cpuid-bool", - "opaque-debug", - "universal-hash", -] +checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "1.0.8" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ - "difference", + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] name = "predicates" -version = "2.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ + "anstyle", "difflib", - "float-cmp", "itertools", - "normalize-line-endings", "predicates-core", - "regex", ] [[package]] name = "predicates-core" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" dependencies = [ "predicates-core", "termtree", @@ -2644,14 +2389,14 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ansi_term", "ctor", "diff", "output_vt100", + "yansi", ] [[package]] @@ -2676,7 +2421,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -2693,15 +2438,15 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -2714,14 +2459,20 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] [[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] name = "radix_trie" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2733,49 +2484,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2785,67 +2500,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core", ] [[package]] name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] -name = "rdrand" -version = "0.4.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "rand_core 0.3.1", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2854,16 +2536,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", - "redox_syscall", + "getrandom", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -2871,27 +2553,24 @@ dependencies = [ ] [[package]] -name = "regex-syntax" -version = "0.6.27" +name = "regex-automata" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -2903,10 +2582,10 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "serde", @@ -2924,13 +2603,14 @@ dependencies = [ [[package]] name = "rexpect" -version = "0.3.0" -source = "git+https://github.com/tailhook/rexpect?branch=default_terminal_size#a9526163bdb833f7b25beb363430042b11e42493" +version = "0.5.0" +source = "git+https://github.com/tailhook/rexpect?branch=default_terminal_size#7643379e581e8019b49070782e5b6df34d762178" dependencies = [ - "error-chain", - "nix 0.14.1", + "comma", + "nix", "regex", "tempfile", + "thiserror", ] [[package]] @@ -2973,65 +2653,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] name = "rustix" -version = "0.35.7" +version = "0.37.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", - "io-lifetimes 0.7.2", + "io-lifetimes", "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.36.1", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes 1.0.5", - "libc", - "linux-raw-sys 0.1.4", + "linux-raw-sys", "windows-sys 0.45.0", ] [[package]] name = "rustls" -version = "0.19.1" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ - "base64", "log", "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -dependencies = [ - "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", + "sct", + "webpki", ] [[package]] @@ -3041,48 +2685,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rustyline" version = "8.0.0" -source = "git+https://github.com/tailhook/rustyline?branch=edgedb_20210403#257bb4bb5c0f647412103e4f336d553b97472849" +source = "git+https://github.com/tailhook/rustyline?branch=edgedb_20210403#8c0afd236b4869f9fbf41a6a322149feacbe49bd" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "cfg-if", "dirs-next", "fd-lock 2.0.0", "libc", "log", "memchr", - "nix 0.20.0", + "nix", "radix_trie", "scopeguard", "smallvec", @@ -3094,25 +2729,33 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -3126,23 +2769,13 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7679a5e6b97bac99b2c208894ba0d34b17d9657f0b728c1cd3bf1c5f7f6ebe88" dependencies = [ - "base64", - "rand 0.8.5", + "base64 0.13.1", + "rand", "ring", ] [[package]] name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" @@ -3153,11 +2786,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.6.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3166,9 +2799,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -3176,54 +2809,40 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] [[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] name = "serde" -version = "1.0.142" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.142" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "serde_json" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ + "indexmap 1.9.3", "itoa", "ryu", "serde", @@ -3240,25 +2859,14 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ "serde", ] [[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] name = "serde_str" version = "1.0.0" source = "git+https://github.com/tailhook/serde-str#d48076ec69a86e82abeca5f44c0b73ada1fda848" @@ -3279,64 +2887,25 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] name = "sha1" -version = "0.10.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest", ] [[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] name = "sha2" -version = "0.9.9" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", + "digest", ] [[package]] @@ -3352,20 +2921,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" [[package]] -name = "signal" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6ce83b159ab6984d2419f495134972b48754d13ff2e3f8c998339942b56ed9" -dependencies = [ - "libc", - "nix 0.14.1", -] - -[[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -3384,36 +2943,27 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] -name = "simple-mutex" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" -dependencies = [ - "event-listener", -] - -[[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smawk" @@ -3423,9 +2973,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "snafu" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2" +checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" dependencies = [ "backtrace", "doc-comment", @@ -3434,21 +2984,21 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" +checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -3461,70 +3011,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3537,32 +3029,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] -name = "surf" -version = "2.3.2" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "async-native-tls", - "async-std", - "async-trait", - "cfg-if 1.0.0", - "futures-util", - "getrandom 0.2.7", - "http-client", - "http-types", - "log", - "mime_guess", - "once_cell", - "pin-project-lite", - "serde", - "serde_json", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.99" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -3570,6 +3051,12 @@ dependencies = [ ] [[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] name = "tar" version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3581,27 +3068,16 @@ dependencies = [ ] [[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - -[[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -3616,29 +3092,19 @@ dependencies = [ ] [[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "termimad" -version = "0.20.2" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a16d7de8d4c97a4149cc3b9d3681c5dba36011c303745bb1af19636e89ba39" +checksum = "cfab44b4bc17601cf226cce31c87462a4a5bd5d325948c8ebbc9e715660a1287" dependencies = [ "coolor", "crossbeam", @@ -3650,57 +3116,58 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "termtree" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "test-case" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07aea929e9488998b64adc414c29fe5620398f01c2e3f58164122b17e567a6d5" +checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" dependencies = [ "test-case-macros", ] [[package]] name = "test-case-macros" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95968eedc6fc4f5c21920e0f4264f78ec5e4c56bb394f319becc1a5830b3e54" +checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "test-cert-gen" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3208d0ae2e3736d4ac2f6ba2229c4d9bbd54080e228e662a7684eabcf13ff419" +checksum = "345f92b7cac59507cdaba298c5493f7c40e2063d31f6fc621105183344d5d50a" dependencies = [ + "once_cell", "pem 0.8.3", - "tempdir", + "tempfile", ] [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ "smawk", "terminal_size", @@ -3709,98 +3176,40 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "syn 2.0.18", ] [[package]] name = "time" -version = "0.2.27" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" -dependencies = [ - "itoa", - "js-sys", - "libc", - "num_threads", - "time-macros 0.2.4", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", + "serde", + "time-core", ] [[package]] -name = "time-macros" -version = "0.2.4" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "tinyvec" @@ -3813,107 +3222,106 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tls-api" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7dded74ddc6d4a98f9f94f17f1c4d796e4af3cb5fba9e7655f157a036ee7de0" +checksum = "66d1b3dfb0a60da3e8a130c9f2432063d9979928a05c2b2cdcfc9fd05e4f53a3" dependencies = [ "anyhow", - "futures-util", "log", "pem 0.8.3", - "tempdir", + "tempfile", "thiserror", + "tokio", "void", - "webpki 0.22.0", + "webpki", ] [[package]] name = "tls-api-not-tls" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9026a0d37898cc761deb9aa92e727c61412f24c490853337a5dcba95f1e9adf" +checksum = "529dda0254aa61462ebe3937ecf877b6b1d7e745d25b74c18ba98593aefd7086" dependencies = [ "anyhow", - "async-std", "thiserror", "tls-api", "tls-api-test", + "tokio", ] [[package]] name = "tls-api-rustls" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eeadd40cf3e8d610d3ccc5cc71443629ac0aa2c66aee7bc085c7d0b03c706a6" +checksum = "afcd7905a7d9603bc4c1bcf4710141d463cde70f027ab7900bc1d0012712444d" dependencies = [ "anyhow", - "async-std", - "rustls 0.20.6", + "rustls", "thiserror", "tls-api", "tls-api-test", - "webpki 0.22.0", + "tokio", + "webpki", "webpki-roots", ] [[package]] name = "tls-api-test" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344ab291be7ed9ab296fc28153fe3ac1e430f44c4dfb3f1324a3c09bbbb5f104" +checksum = "9df107843d725428d76bb159040fbae6d1524dcf25d5b24c56daa6b37ce9dbb5" dependencies = [ "anyhow", - "async-std", "env_logger 0.5.13", "log", "pem 0.8.3", "test-cert-gen", "tls-api", + "tokio", "untrusted 0.6.2", - "webpki 0.22.0", + "webpki", ] [[package]] name = "tokio" -version = "1.20.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -3921,45 +3329,31 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.19.1", + "rustls", "tokio", - "webpki 0.21.4", + "webpki", ] [[package]] name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ - "bytes", "futures-core", - "futures-sink", - "log", "pin-project-lite", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -3971,9 +3365,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -3986,11 +3380,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-core", @@ -3998,70 +3392,39 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", ] [[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - -[[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.64" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" +checksum = "db3115bddce1b5f52dd4b5e0ec8298a66ce733e4cc6759247dc2d1c11508ec38" dependencies = [ + "basic-toml", "glob", "once_cell", "serde", "serde_derive", "serde_json", "termcolor", - "toml", -] - -[[package]] -name = "twoway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" -dependencies = [ - "memchr", - "unchecked-index", -] - -[[package]] -name = "typemap" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -dependencies = [ - "unsafe-any", ] [[package]] name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unchecked-index" -version = "0.2.2" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" @@ -4074,64 +3437,46 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-linebreak" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f" +checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ + "hashbrown 0.12.3", "regex", ] [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "unsafe-any" -version = "0.4.2" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -dependencies = [ - "traitobject", -] +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "untrusted" @@ -4147,44 +3492,42 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", "serde", ] [[package]] name = "urlencoding" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.1.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +dependencies = [ + "serde", +] [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" [[package]] name = "vcpkg" @@ -4220,6 +3563,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] name = "want" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4231,9 +3585,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" +checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" dependencies = [ "bytes", "futures-channel", @@ -4246,6 +3600,7 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", + "rustls-pemfile", "scoped-tls", "serde", "serde_json", @@ -4253,61 +3608,49 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tokio-util 0.6.10", + "tokio-util", "tower-service", "tracing", ] [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4315,9 +3658,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4325,22 +3668,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wchar" @@ -4361,14 +3704,14 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4376,16 +3719,6 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" @@ -4396,38 +3729,29 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -dependencies = [ - "webpki 0.22.0", -] - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "cc", + "webpki", ] [[package]] name = "which" -version = "4.2.5" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "whoami" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" +checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" dependencies = [ "wasm-bindgen", "web-sys", @@ -4466,15 +3790,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", ] [[package]] @@ -4483,7 +3809,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -4492,26 +3827,41 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.1", "windows_aarch64_msvc 0.42.1", "windows_i686_gnu 0.42.1", "windows_i686_msvc 0.42.1", "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.1", "windows_x86_64_msvc 0.42.1", ] [[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -4520,10 +3870,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -4532,10 +3882,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnu" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -4544,10 +3894,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" +name = "windows_i686_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -4556,16 +3906,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -4574,6 +3930,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4594,6 +3956,15 @@ dependencies = [ ] [[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] name = "xattr" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4603,39 +3974,64 @@ dependencies = [ ] [[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] name = "zip" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.7.5", + "aes", "byteorder", "bzip2", - "constant_time_eq", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", - "hmac 0.12.1", + "hmac", "pbkdf2", - "sha1 0.10.1", - "time 0.3.12", - "zstd", + "sha1", + "time", + "zstd 0.11.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe 5.0.2+zstd.1.5.2", ] [[package]] name = "zstd" -version = "0.10.2+zstd.1.5.2" +version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ - "zstd-safe", + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] name = "zstd-safe" -version = "4.1.6+zstd.1.5.2" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-safe" +version = "6.0.5+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" dependencies = [ "libc", "zstd-sys", @@ -4643,10 +4039,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index 1409bd07081..14f45976ff5 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, runCommand , patchelf , fetchFromGitHub , rustPlatform @@ -20,23 +19,24 @@ rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "2.3.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "v${version}"; - sha256 = "sha256-iL8tD6cvFVWqsQAk6HBUqdz7MJ3lT2XmExGQvdQdIWs="; + sha256 = "sha256-6uhwuAGZ/XU+eENNo0H7hOdrDDx0fWvPVZAEOm5mdcY="; + fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "assert_cmd-1.0.1" = "sha256-0MkQG+JKrZXOn8B8q1HdyhZ1hVVb7dPbGEo/76o2YRc="; - "edgedb-derive-0.4.0" = "sha256-pE/GchC3JDg0E4twmov86byne+rn28JpIawBbZcJHOg="; - "edgeql-parser-0.1.0" = "sha256-e43PBHirALfrxGKi50KvE9aDAunObpXcWNBs62ssgSM="; - "rexpect-0.3.0" = "sha256-0a//fPscEXEwv+73Ja7jRf2eRWfF6VCsck9ZZ15zgog="; - "rustyline-8.0.0" = "sha256-FyMx2nAVaX0pc481BTlNxeR/NfNrr57FWKLS7+EjPVw="; + "edgedb-derive-0.5.0" = "sha256-y/mN0XuJtQBtkLmbk2s7hK5joGEH5Ge6sLCD88WyL9o="; + "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY="; + "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; + "edgeql-parser-0.1.0" = "sha256-Y3gXxPuR7qnTL4fu2nZIa3e20YV1fLvm2jHAng+Ke2Q="; + "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak="; }; }; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index e9266a55548..5f6e0db6d58 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , fetchzip , androidenv , makeWrapper diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index 86891f45987..f04c3369bac 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, darwin, networkmanager, iw, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, networkmanager, iw, Security }: rustPlatform.buildRustPackage rec { pname = "ifwifi"; diff --git a/pkgs/tools/networking/mtr-exporter/default.nix b/pkgs/tools/networking/mtr-exporter/default.nix index 0243774262a..62b884fe647 100644 --- a/pkgs/tools/networking/mtr-exporter/default.nix +++ b/pkgs/tools/networking/mtr-exporter/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "mtr-exporter"; version = "0.1.0"; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 9ce71df109e..bf324c57d49 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libcap diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 2ca9261f1f2..83b0c0b39ac 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.21.8"; + version = "0.21.11"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BSLstxiiFUJZLIVqHsAFv20GdXJaq2OucG40+lu5LYU="; + sha256 = "sha256-WC2KZ9geskQtwtWitQTR1GPBHXs/7KWSuZNw7u+gkZA="; }; - vendorHash = "sha256-R5LhqW6uh7R8/vr60Sy0kVpAaTL3rwh5c4Ix08Rx6Zk="; + vendorHash = "sha256-RgvFbhhvfo4GyimAbUGjdU5DsuqS0pslD/oCmvFrtdg="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/nethoscope/default.nix b/pkgs/tools/networking/nethoscope/default.nix index 276579f361f..9a17adc3800 100644 --- a/pkgs/tools/networking/nethoscope/default.nix +++ b/pkgs/tools/networking/nethoscope/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , rustPlatform +, fetchFromGitHub , pkg-config , alsa-lib , libpcap diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index ab747df01f8..4983c30ab00 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection systemd libselinux audit diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix index 7af0be41835..2d4656e69b7 100644 --- a/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation rec { sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0="; }; - buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython ]; dontBuild = true; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 8f3ed67abcf..a47b23e9634 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -21,7 +21,6 @@ , withGnome ? true , gcr_4 , glib -, substituteAll , lib , _experimental-update-script-combinators , makeHardcodeGsettingsPatch diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index 545dd3d82cd..f46fb127208 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -7,7 +7,6 @@ , strongswanNM , gtk3 , gtk4 -, gnome , libsecret , libnma , libnma-gtk4 diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index f2af99a922f..9c1bb43a673 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, autoreconfHook, pkg-config, stdenv, fetchpatch, fetchFromGitHub }: +{ lib, autoreconfHook, pkg-config, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nss-mdns"; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 0da1cb1866a..778aea8354e 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitLab, fetchurl, darwin }: +{ callPackage, fetchurl, darwin }: let common = opts: callPackage (import ./common.nix opts) { inherit (darwin.apple_sdk.frameworks) PCSC; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 28bcba68a15..f3028573c05 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -13,7 +13,6 @@ # package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606 , pkgs , fetchurl -, fetchpatch , zlib , openssl , libedit @@ -30,7 +29,7 @@ , linkOpenssl ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname version src; patches = [ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d202ac446ba..ba0ce50d3fb 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: +{ callPackage, lib, fetchurl, fetchpatch, autoreconfHook }: let common = opts: callPackage (import ./common.nix opts) { }; in diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 0ef5076eaf9..87cbd6881e2 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -9,7 +9,6 @@ , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , update-systemd-resolved -, util-linux , pkcs11Support ? false , pkcs11helper }: diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ff8ecc385cd..6d4950b40fc 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -15,7 +15,6 @@ , boost # Not using boost leads to crashes with gtk3 , gettext , libpng -, autoreconfHook , pkg-config , makeWrapper , libX11 diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 3c9a6e72332..16eaf0d14e9 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , pkg-config , gettext @@ -10,7 +9,6 @@ , libxml2 , libbfd , zlib -, binutils , gnutls , enableGui ? true }: @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { zlib ] ++ - lib.optionals (enableGui) [ gtk2 ] + lib.optionals enableGui [ gtk2 ] ; configureScript = "./build.sh"; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index f8e5e33eb46..ed449ecb992 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub , aria , libnotify , pulseaudio diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 535545f42bc..20e59167699 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -8,7 +8,6 @@ , openssl , bash , nixosTests -, writeTextDir }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/tools/networking/rconc/default.nix index 53fc4d0b5aa..613c4a8a31b 100644 --- a/pkgs/tools/networking/rconc/default.nix +++ b/pkgs/tools/networking/rconc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgs }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { version = "0.1.4"; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 0c9e515ce09..79fd1c17a49 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -7,7 +7,6 @@ , perl , perlPackages , lib, stdenv -, tree , util-linux }: let diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index c12c31e9965..d8f3858d59b 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-I6e0PkF52sCKPtQIOIlYdpWzySDnEqX8KmK/e29CQG8="; + hash = "sha256-0/3y9aIhKzWIvt8iWcrJwQreBkSLcoPQ55gyTp48ysg="; }; - vendorHash = "sha256-CL+N2w8g5aMysFlPgPLszqjPu8MULoQ/xpz8Wd3lI6k="; + vendorHash = "sha256-G6//YPNWhgTJf6nv+9KRExCclotsmk7TzzuxXmdiVVU="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/swagger-cli/default.nix b/pkgs/tools/networking/swagger-cli/default.nix index 9c9145f327f..5a20ce93cc7 100644 --- a/pkgs/tools/networking/swagger-cli/default.nix +++ b/pkgs/tools/networking/swagger-cli/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , buildNpmPackage +, fetchFromGitHub }: buildNpmPackage rec { diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 090357fa6e6..4866cfea41e 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchFromGitHub, makeWrapper, git +{ lib, pythonPackages, fetchFromGitHub, makeWrapper , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils , iptables, bash }: diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 0b4e75879ca..6a7c65756a0 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl -, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux +, docbook_xsl, coreutils, lsof, makeWrapper, sg3_utils }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 24f96e63d79..f15f398dc7d 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { pname = "tinc"; diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/tools/networking/transmission-rss/default.nix index 50056c3ebdb..095ccfb91a5 100644 --- a/pkgs/tools/networking/transmission-rss/default.nix +++ b/pkgs/tools/networking/transmission-rss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { version = "0.3.1"; diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index dea517a67d3..3b513987320 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages, trurl, testers }: +{ lib, stdenv, fetchFromGitHub, curl, python3, trurl, testers }: stdenv.mkDerivation rec { pname = "trurl"; diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/tools/networking/userhosts/default.nix index 6cec402638a..10bfbd650aa 100644 --- a/pkgs/tools/networking/userhosts/default.nix +++ b/pkgs/tools/networking/userhosts/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "userhosts"; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index f9507cf459c..d5fd324719b 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , makeWrapper, pkg-config, perl -, gawk, gnutls, libgcrypt, openresolv, vpnc-scripts +, gnutls, libgcrypt, vpnc-scripts , opensslSupport ? false, openssl # Distributing this is a GPL violation. }: diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index 15dc7b163b5..2f74cd86e73 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, wireguard-go, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "wg-netmanager"; diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/tools/networking/whatip/default.nix index 735936a4da4..08979e71e35 100644 --- a/pkgs/tools/networking/whatip/default.nix +++ b/pkgs/tools/networking/whatip/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook4 appstream-glib desktop-file-utils + gobject-introspection ]; buildInputs = [ @@ -44,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { gtk4 librsvg libadwaita - gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/tools/networking/wtfis/default.nix index 06c321d99d6..ba6175f59b3 100644 --- a/pkgs/tools/networking/wtfis/default.nix +++ b/pkgs/tools/networking/wtfis/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , python3 +, fetchFromGitHub }: let diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/tools/networking/xrootd/fetchxrd.nix index b7a77f80549..2d197f8504f 100644 --- a/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -33,10 +33,10 @@ echo "xrdcp failed trying to download any of the urls" >&2 exit $ret fi - '').overrideAttrs (finalAttrs: prevAttrs: + '').overrideAttrs (finalAttrs: if (pname != "" && version != "") then { inherit pname version; - name = with finalAttrs; "${pname}-${version}"; + name = "${pname}-${version}"; } else { name = if (name != "") then name else (baseNameOf finalAttrs.url); }) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 40901804e97..c761d887e35 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -59,10 +59,11 @@ in stdenv.mkDerivation { rustc ]; buildInputs = [ - iproute2 lzo openssl zlib + ] ++ lib.optional stdenv.isLinux [ + iproute2 ]; enableParallelBuilding = true; @@ -96,6 +97,6 @@ in stdenv.mkDerivation { homepage = "https://www.zerotier.com"; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 2666a4f0b62..bbd5c2dc260 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, patchelf }: +{ lib, stdenv, fetchzip }: let inherit (stdenv.hostPlatform) system; @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-B2dK4yZPBitt6WT0wBJB2Wvly3ykDlFVZT5409XH7GY="; - aarch64-linux = "sha256-FQ+RvOmB4j3Y67tIx0OqkjFunkhYMNJASZUkTOMxKTU="; - armv7l-linux = "sha256-bRhaF3PaulcjzVxB3kalvHrJKK8sEOnmXJnjBI7yBbk="; + x86_64-linux = "sha256-sHQD8uN8Pm/LnayW1XdWXJ90gN4cCE4sGd+Or4TlhP8="; + aarch64-linux = "sha256-VJaVC+sfqdT0BnV1v8MjzftemP4Iuln1wy3BaCTbeYA="; + armv7l-linux = "sha256-7v9u7OtUbtnzvlTBvO5zuIuTgNqualxYsrv97TZGa9U="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.0"; + version = "0.4.2"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 3df316ef9e3..0cbf0f6b106 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, nix, openssl, pkg-config, ronn, rustPlatform }: +{ lib, fetchFromGitHub, nix, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/pkgs/tools/nix/devour-flake/default.nix b/pkgs/tools/nix/devour-flake/default.nix new file mode 100644 index 00000000000..a4248365355 --- /dev/null +++ b/pkgs/tools/nix/devour-flake/default.nix @@ -0,0 +1,27 @@ +{ writeShellApplication +, fetchFromGitHub +, nix +}: + +let + devour-flake = fetchFromGitHub { + owner = "srid"; + repo = "devour-flake"; + rev = "v2"; + hash = "sha256-CZedJtbZlWAbv/b/aYgOEFd9vcTBn/oJNI3p29UitLk="; + }; +in +writeShellApplication { + name = "devour-flake"; + runtimeInputs = [ nix ]; + text = '' + FLAKE="$1" + shift 1 || true + + nix build ${devour-flake}#default \ + "$@" \ + -L --no-link --print-out-paths \ + --override-input flake "$FLAKE" \ + | xargs cat + ''; +} diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix index 768a283ebd2..6975e61fa6c 100644 --- a/pkgs/tools/nix/manix/default.nix +++ b/pkgs/tools/nix/manix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "manix"; diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix new file mode 100644 index 00000000000..0d881d6976e --- /dev/null +++ b/pkgs/tools/nix/nixci/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, rustPlatform +, fetchCrate +, libiconv +, openssl +, pkg-config +, Security +, devour-flake +}: + +rustPlatform.buildRustPackage rec { + pname = "nixci"; + version = "0.1.3"; + + src = fetchCrate { + inherit version; + pname = "nixci"; + hash = "sha256-sM/1G1mf+msWbG4CX/pZNt4FmSKR2hWXdcq5h7W1AM0="; + }; + + cargoHash = "sha256-PKBNQKuWV4PE7iSKr+LugayroFjDBT4/vyyjJiw/E+I="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libiconv openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + # The rust program expects an environment (at build time) that points to the + # devour-flake executable. + DEVOUR_FLAKE = lib.getExe devour-flake; + + meta = with lib; { + description = "Define and build CI for Nix projects anywhere"; + homepage = "https://github.com/srid/nixci"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ srid ]; + mainProgram = "nixci"; + }; +} diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 785261a8e09..7fc47ef91a7 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "nixdoc"; diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix index 8a00c15d905..63f2da0df21 100644 --- a/pkgs/tools/nix/nixos-install-tools/default.nix +++ b/pkgs/tools/nix/nixos-install-tools/default.nix @@ -63,7 +63,7 @@ in touch $out ''; }; -}).overrideAttrs (o: { +}).overrideAttrs { inherit version; pname = "nixos-install-tools"; -}) +} diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix index 96f2f554888..b9b589ebd22 100644 --- a/pkgs/tools/nix/npins/default.nix +++ b/pkgs/tools/nix/npins/default.nix @@ -1,7 +1,5 @@ { lib , rustPlatform -, fetchFromGitHub -, nix-gitignore , makeWrapper , stdenv , darwin diff --git a/pkgs/tools/nix/web-devmode.nix b/pkgs/tools/nix/web-devmode.nix new file mode 100644 index 00000000000..6ebdc31118f --- /dev/null +++ b/pkgs/tools/nix/web-devmode.nix @@ -0,0 +1,117 @@ +{ + pkgs, + # arguments to `nix-build`, e.g. `"foo.nix -A bar"` + buildArgs, + # what path to open a browser at + open, +}: let + inherit (pkgs) lib; + + error_page = pkgs.writeShellScriptBin "error_page" '' + echo "<!DOCTYPE html> + <html> + <head> + <style> + @media (prefers-color-scheme: dark) { + :root { filter: invert(100%); } + } + </style> + </head> + <body><pre>$1</pre></body> + </html>" + ''; + + # The following would have been simpler: + # 1. serve from `$serve` + # 2. pass each build a `--out-link $serve/result` + # But that way live-server does not seem to detect changes and therefore no + # auto-reloads occur. + # Instead, we copy the contents of each build to the `$serve` directory. + # Using rsync here, instead of `cp`, to get as close to an atomic + # directory copy operation as possible. `--delay-updates` should + # also go towards that. + build_and_copy = pkgs.writeShellScriptBin "build_and_copy" '' + set -euxo pipefail + + set +e + stderr=$(2>&1 nix-build --out-link $out_link ${buildArgs}) + exit_status=$? + set -e + + if [ $exit_status -eq 0 ]; + then + # setting permissions to be able to clean up + ${lib.getBin pkgs.rsync}/bin/rsync \ + --recursive \ + --chmod=u=rwX \ + --delete-before \ + --delay-updates \ + $out_link/ \ + $serve/ + else + set +x + ${lib.getBin error_page}/bin/error_page "$stderr" > $error_page_absolute + set -x + + ${lib.getBin pkgs.findutils}/bin/find $serve \ + -type f \ + ! -name $error_page_relative \ + -delete + fi + ''; + + # https://watchexec.github.io/ + watcher = pkgs.writeShellScriptBin "watcher" '' + set -euxo pipefail + + ${lib.getBin pkgs.watchexec}/bin/watchexec \ + --shell=none \ + --restart \ + --print-events \ + ${lib.getBin build_and_copy}/bin/build_and_copy + ''; + + # A Rust alternative to live-server exists, but it was not in nixpkgs. + # `--no-css-inject`: without this it seems that only CSS is auto-reloaded. + # https://www.npmjs.com/package/live-server + server = pkgs.writeShellScriptBin "server" '' + set -euxo pipefail + + ${lib.getBin pkgs.nodePackages_latest.live-server}/bin/live-server \ + --host=127.0.0.1 \ + --verbose \ + --no-css-inject \ + --entry-file=$error_page_relative \ + --open=${open} \ + $serve + ''; + + devmode = + pkgs.writeShellScriptBin "devmode" + '' + set -euxo pipefail + + function handle_exit { + rm -rf "$tmpdir" + } + + tmpdir=$(mktemp -d) + trap handle_exit EXIT + + export out_link="$tmpdir/result" + export serve="$tmpdir/serve" + mkdir $serve + export error_page_relative=error.html + export error_page_absolute=$serve/$error_page_relative + ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute + + ${lib.getBin pkgs.parallel}/bin/parallel \ + --will-cite \ + --line-buffer \ + --tagstr '{/}' \ + ::: \ + "${lib.getBin watcher}/bin/watcher" \ + "${lib.getBin server}/bin/server" + ''; +in + devmode diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 3fa9528add1..d11cd161275 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -17,7 +17,7 @@ let }; # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec { + appimagekit_squashfuse = squashfuse.overrideAttrs rec { pname = "squashfuse"; version = "unstable-2016-10-09"; @@ -61,7 +61,7 @@ let cp -v ./.libs/*.a $out/lib cp -v ./*.h $out/include ''; - }); + }; in stdenv.mkDerivation rec { pname = "appimagekit"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index dedb57960b3..27f055c089c 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }: stdenv.mkDerivation rec { pname = "disnix"; diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 087bde2cbb7..7dbc07dbc10 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.0.15"; + version = "5.1.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-0MR9CJDFL1vbuO7FZyyn3PNb0p27oaho6I2eminTyYU="; + hash = "sha256-Bwr/qQ6ri1c3tTYlFG28TzUpZCw4qqhO+ba67EAeBTY="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/tools/package-management/fusesoc/default.nix index 92a8dc1807b..99926fd5c04 100644 --- a/pkgs/tools/package-management/fusesoc/default.nix +++ b/pkgs/tools/package-management/fusesoc/default.nix @@ -4,7 +4,6 @@ , verilog , verilator , gnumake -, gcc , edalize , fastjsonschema , pyparsing diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 89a626fef67..c65b244cb96 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -14,7 +14,7 @@ , unstableGitUpdater }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "home-manager"; version = "2023-05-30"; @@ -89,4 +89,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ AndersonTorres ]; }; -}) +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5b2fa002913..6ff28eb4e65 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -76,10 +76,10 @@ let aws-sdk-cpp-nix = (aws-sdk-cpp.override { apis = [ "s3" "transfer" ]; customMemoryManagement = false; - }).overrideAttrs (args: { + }).overrideAttrs { # only a stripped down version is build which takes a lot less resources to build requiredSystemFeatures = [ ]; - }); + }; common = args: @@ -186,6 +186,11 @@ in lib.makeExtensible (self: ({ hash = "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU="; }; + nix_2_17 = common { + version = "2.17.0"; + hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; + }; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available @@ -205,7 +210,7 @@ in lib.makeExtensible (self: ({ stable = self.nix_2_15; - unstable = self.nix_2_16; + unstable = self.nix_2_17; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 7b689480c2a..dba9d11b472 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -1,4 +1,10 @@ -{ lib, python3, fetchFromGitHub, fetchPypi, nix-update-script }: +{ lib +, stdenv +, python3 +, fetchFromGitHub +, fetchPypi +, nix-update-script +}: let python = python3.override { # override resolvelib due to @@ -7,7 +13,7 @@ let # 3. Ansible being unable to upgrade to a later version of resolvelib # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 packageOverrides = self: super: { - resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { + resolvelib = super.resolvelib.overridePythonAttrs rec { version = "1.0.1"; src = fetchFromGitHub { owner = "sarugaku"; @@ -15,7 +21,7 @@ let rev = "/refs/tags/${version}"; hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; }; - }); + }; }; self = python; }; @@ -24,13 +30,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.7.4"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x3+N8cy31wHwBeOkMNpLihlqKCTiPmnS1avrr69uUM4="; + hash = "sha256-BgsWKP2kZfLEHgZNISyp66Yww0ajMF4RWuI6TCzwJNo="; }; nativeBuildInputs = [ @@ -39,7 +45,6 @@ buildPythonApplication rec { propagatedBuildInputs = [ blinker - cacheyou certifi cachecontrol findpython @@ -70,7 +75,7 @@ buildPythonApplication rec { pytest-rerunfailures pytest-xdist pytest-httpserver - ]; + ] ++ lib.optional stdenv.isLinux first; pytestFlagsArray = [ "-m 'not network'" diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 5a67e00363b..25c3fd13432 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.19.1"; + version = "1.20.4"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "WHR2evPn4Y0wzGwVUEuYPrDDnuPSsYHr4xIofAHeTJk="; + sha256 = "sha256-GW29jbFt68ITJfmuxkwl8c39mA+ObYiV6NeT/OXPlyM="; }; setOutputFlags = false; diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 69eab159c79..62c4ac59969 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -23,6 +23,14 @@ let self.lockfile ]; }); + keyring = super.keyring.overridePythonAttrs (old: rec { + version = "23.13.1"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng="; + }; + }); poetry-core = super.poetry-core.overridePythonAttrs (old: rec { version = "1.6.1"; src = fetchFromGitHub { @@ -36,17 +44,6 @@ let self.tomli-w ]; }); - virtualenv = super.virtualenv.overridePythonAttrs (old: rec { - version = "20.23.1"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-j/GaOMECHHQhSO3E+By0PX+MaBbS7eKrcq9bhMdJreE="; - }; - nativeCheckInputs = old.nativeCheckInputs ++ [ - self.time-machine - ]; - }); } // (plugins self); }; diff --git a/pkgs/tools/security/age-plugin-tpm/default.nix b/pkgs/tools/security/age-plugin-tpm/default.nix index 89291096db9..8882a70a1a9 100644 --- a/pkgs/tools/security/age-plugin-tpm/default.nix +++ b/pkgs/tools/security/age-plugin-tpm/default.nix @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://github.com/Foxboron/age-plugin-tpm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ kranzes sgo ]; }; } diff --git a/pkgs/tools/security/authz0/default.nix b/pkgs/tools/security/authz0/default.nix index 850e6321300..04d2598fd52 100644 --- a/pkgs/tools/security/authz0/default.nix +++ b/pkgs/tools/security/authz0/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "authz0"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - hash = "sha256-8WtvUeHP7fJ1/G+UB1QLCSSNx7XA+vREcwJxoMeQsgM="; + hash = "sha256-NrArxuhzd57NIdM4d9p/wfCB1e6l83pV+cjjCgZ9YtM="; }; - vendorSha256 = "sha256-EQhvHu/LXZtVQ+MzjB96K0MUM4THiRDe1FkAATfGhdw="; + vendorHash = "sha256-ARPrArvCgxLdCaiUdJyjB/9GbbldnMXwFbyYubbsqxc="; meta = with lib; { description = "Automated authorization test tool"; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index b6ae17a6117..4f1dcf31828 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.5.9"; + version = "0.6.11"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lopOFEWqRWZox/XniQX6OiQPWlmWJpnQ7yFueiTZpss="; + hash = "sha256-4bZnGgf/H2/uLhh8ip8rrA+U0vA+1SO5uhjLK40j3wE="; }; - # Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 - deleteVendor = true; - vendorSha256 = null; + vendorHash = "sha256-RcZqnyZtonE4qeu+llL1OPGPG93/Rx8ESWM5wapZ1BM="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ "-s" "-w" diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix index 715811046d7..446dc89bd8b 100644 --- a/pkgs/tools/security/bitwarden/cli.nix +++ b/pkgs/tools/security/bitwarden/cli.nix @@ -5,22 +5,23 @@ , fetchFromGitHub , python3 , darwin +, nixosTests }: let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; in buildNpmPackage' rec { pname = "bitwarden-cli"; - version = "2023.5.0"; + version = "2023.7.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU="; + hash = "sha256-Xnfjp+qRJWvxvgSODbajLxYsP2DtOYK9CXBMfIn+qwA="; }; - npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY="; + npmDepsHash = "sha256-vz7erDhh3BpHNadPwIXkD2PRCnbxM7e7lE0rvBEXGyc="; nativeBuildInputs = [ python3 @@ -36,6 +37,10 @@ in buildNpmPackage' rec { npmWorkspace = "apps/cli"; + passthru.tests = { + vaultwarden = nixosTests.vaultwarden.sqlite; + }; + meta = with lib; { changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; description = "A secure and free password manager for all of your devices"; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 5c835d34eb0..88952936432 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.19.0"; + version = "8.20.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-0vRhEkkyZMcqA5CGq1oDnODCTSzstpkVOGv2WrPnuWY="; + hash = "sha256-VPXxeI4dO6bHUagS38l7358sXW3ot/v/j9MUrD/akNg="; }; proxyVendor = true; - vendorHash = "sha256-UH46ejn6SfXjkyKaM3mX4IYgyNbt2mp9ycl2M+3xvU0="; + vendorHash = "sha256-LH9ts/hD16rF9VBJIfwTAQXq9MMAiBKBR3ulKGNrlow="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/das/default.nix b/pkgs/tools/security/das/default.nix index f8ccf8cb4ac..2f7cd2fa98f 100644 --- a/pkgs/tools/security/das/default.nix +++ b/pkgs/tools/security/das/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "das"; - version = "0.3.6"; + version = "0.3.8"; format = "pyproject"; src = fetchFromGitHub { owner = "snovvcrash"; repo = "DivideAndScan"; rev = "refs/tags/v${version}"; - hash = "sha256-UFuIy19OUiS8VmmfGm0F4hI4s4BU5b4ZVh40bFGiLfk="; + hash = "sha256-a9gnEBTvZshw42M/GrpCgjZh6FOzL45aZqGRyeHO0ec="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'networkx = "^2.8.4"' 'networkx = "*"' + --replace 'networkx = "^2.8.4"' 'networkx = "*"' \ + --replace 'pandas = "^1.4.2"' 'pandas = "*"' ''; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/enc/default.nix b/pkgs/tools/security/enc/default.nix index 00d6d0211f8..646d7c80559 100644 --- a/pkgs/tools/security/enc/default.nix +++ b/pkgs/tools/security/enc/default.nix @@ -7,17 +7,16 @@ buildGoModule rec { pname = "enc"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "life4"; repo = "enc"; - rev = "v${version}"; - sha256 = "Tt+J/MnYJNewSl5UeewS0b47NGW2yzfcVHA5+9UQWSs="; + rev = version; + hash = "sha256-kVK/+pR3Rzg7oCjHKr+i+lK6nhqlBN6Wj92i4SKU2l0="; }; - vendorSha256 = "lB6GkE6prfBG7OCOJ1gm23Ee5+nAgmJg8I9Nqe1fsRw="; - proxyVendor = true; + vendorHash = "sha256-6LNo4iBZDc0DTn8f/2PdCb6CNFCjU6o1xDkB5m/twJk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 02facfb9403..182c2f96986 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-07-21"; + version = "2023-07-22"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HJKvIyWJSLsoVq2jpLDN7H1dsLE9+zv5bSZIh3l4W/4="; + hash = "sha256-2P5iyWvoWOYmooMogYrcRyIFzBIQuCgB9E+KH6cTTTU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/firefox_decrypt/default.nix b/pkgs/tools/security/firefox_decrypt/default.nix index def4fc50c10..d006e3140bf 100644 --- a/pkgs/tools/security/firefox_decrypt/default.nix +++ b/pkgs/tools/security/firefox_decrypt/default.nix @@ -8,15 +8,15 @@ buildPythonApplication rec { pname = "firefox_decrypt"; - version = "unstable-2023-07-06"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "unode"; repo = pname; - rev = "2c61b27e6754cdf6a518ea617d05433f5ccf9f39"; - sha256 = "sha256-/Q6ET6NJ23eYo0ywYMY5TPYpzPHGDzH5+wEpFdsibh8="; + rev = "0931c0484d7429f7d4de3a2f5b62b01b7924b49f"; + sha256 = "sha256-9HbH8DvHzmlem0XnDbcrIsMQRBuf82cHObqpLzQxNZM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 4cf5338ca2e..33f6297905e 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ glib @@ -29,7 +30,6 @@ stdenv.mkDerivation rec { libgee xorg.libSM xorg.libICE - gobject-introspection libsecret ]; diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 7ff9fe99475..8f2a9f05fd3 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -15,13 +15,13 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.3.1"; + version = "10.3.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-KYZAu+15rcTkdfVQdKgAlVv3FxREUH0IIgYBb0qjdO8="; + hash = "sha256-CVnEHtSF3DVTH+8qwUsABJq/lRkg6xulEWU+Q5C9ajo="; }; gradle = gradle_7; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index dc7676ca764..0fec2a9ec99 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -2,7 +2,7 @@ , addOpenGLRunpath , config , cudaPackages ? {} -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , fetchurl , makeWrapper , opencl-headers diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 3200a541b16..90999d1f88d 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,20 +5,25 @@ buildGoModule rec { pname = "httpx"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-VYFXxCKlVqueUk/uoD15ay+IWiFKDsBHp5WXZlajw70="; + hash = "sha256-62WOeMnnr08k8pGUTqxiZqHQJxXYqUIh+PzHvJxnJAY="; }; - vendorHash = "sha256-1WamyEnDsuyv0ijHPJthS/ZZVXKrGu8LG8w5wMVoUS0="; + vendorHash = "sha256-ASOheYGuvSHEz51SGUtRGCa3Cl4x+zfIfRkS3JX6vCs="; - subPackages = [ "cmd/httpx" ]; + subPackages = [ + "cmd/httpx" + ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/psudohash/default.nix b/pkgs/tools/security/psudohash/default.nix new file mode 100644 index 00000000000..d5be9f9a772 --- /dev/null +++ b/pkgs/tools/security/psudohash/default.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + stdenv, + python3 +}: + +stdenv.mkDerivation rec { + pname = "psudohash"; + version = "unstable-2023-05-15"; + + src = fetchFromGitHub { + owner = "t3l3machus"; + repo = "psudohash"; + rev = "2d586dec8b5836546ae54b924eb59952a7ee393c"; + hash = "sha256-l/Rp9405Wf6vh85PFrRTtTLJE7GPODowseNqEw42J18="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + install -Dm555 psudohash.py $out/bin/psudohash + + install -Dm444 common_padding_values.txt $out/share/psudohash/common_padding_values.txt + + substituteInPlace $out/bin/psudohash \ + --replace "common_padding_values.txt" "$out/share/${pname}/common_padding_values.txt" + + runHook postInstall + ''; + + meta = with lib; { + description = "Password list generator for orchestrating brute force attacks and cracking hashes"; + homepage = "https://github.com/t3l3machus/psudohash"; + license = licenses.mit; + maintainers = with maintainers; [ exploitoverload ]; + }; +} diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index ccf30f000ed..b0a40fba9dc 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -10,12 +10,12 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.38"; + version = "0.4.39"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-8TMDbkRyTkzULrBeO0SL/WXB240LD/iZLigE/zPum2A="; + hash = "sha256-KXYHeWwV9Tw1ZpO/vASHjDnceeb+1K0yIUohb7EcRAI="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 6e73375be20..e789eeba053 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "sha256-R+dHYG0DBI1uo+yF/pxoTv/V9WSfph043bH6erZjeCE="; + sha256 = "sha256-3CW41ULdXoID4cOgrcG2j85tgIJ/sz5hU7A83qpuxf4="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/security/ronin/Gemfile.lock b/pkgs/tools/security/ronin/Gemfile.lock index a085fb531b3..74d82289194 100644 --- a/pkgs/tools/security/ronin/Gemfile.lock +++ b/pkgs/tools/security/ronin/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.5.1) - activesupport (= 7.0.5.1) - activerecord (7.0.5.1) - activemodel (= 7.0.5.1) - activesupport (= 7.0.5.1) - activesupport (7.0.5.1) + activemodel (7.0.6) + activesupport (= 7.0.6) + activerecord (7.0.6) + activemodel (= 7.0.6) + activesupport (= 7.0.6) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -26,7 +26,7 @@ GEM command_mapper (0.3.1) concurrent-ruby (1.2.2) connection_pool (2.4.1) - console (1.17.2) + console (1.18.0) fiber-annotation fiber-local date (3.3.3) @@ -42,8 +42,8 @@ GEM concurrent-ruby (~> 1.0) io-console (0.6.0) io-event (1.2.2) - irb (1.7.0) - reline (>= 0.3.0) + irb (1.7.4) + reline (>= 0.3.6) mechanize (2.9.1) addressable (~> 2.8) domain_name (~> 0.5, >= 0.5.20190701) @@ -58,7 +58,7 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) - mini_portile2 (2.8.2) + mini_portile2 (2.8.4) minitest (5.18.1) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) @@ -77,7 +77,7 @@ GEM timeout net-smtp (0.3.3) net-protocol - nokogiri (1.15.2) + nokogiri (1.15.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) nokogiri-diff (0.2.0) @@ -86,7 +86,7 @@ GEM nokogiri-ext (0.1.0) nokogiri (~> 1.0) open_namespace (0.4.1) - public_suffix (5.0.1) + public_suffix (5.0.3) racc (1.7.1) rack (2.2.7) rack-protection (3.0.6) @@ -94,14 +94,14 @@ GEM rack-user_agent (0.5.3) rack (>= 1.5) woothee (>= 1.0.0) - reline (0.3.5) + reline (0.3.6) io-console (~> 0.5) - ronin (2.0.3) + ronin (2.0.4) async-io (~> 1.0) open_namespace (~> 0.4) ronin-code-asm (~> 1.0) ronin-code-sql (~> 2.0) - ronin-core (~> 0.1, >= 0.1.1) + ronin-core (~> 0.1, >= 0.1.2) ronin-db (~> 0.1) ronin-exploits (~> 1.0, >= 1.0.1) ronin-fuzzer (~> 0.1) @@ -111,12 +111,12 @@ GEM ronin-vulns (~> 0.1, >= 0.1.2) ronin-web (~> 1.0, >= 1.0.1) rouge (~> 3.0) - wordlist (~> 1.0) + wordlist (~> 1.0, >= 1.0.2) ronin-code-asm (1.0.0) ruby-yasm (~> 0.3) ronin-code-sql (2.1.0) ronin-support (~> 1.0) - ronin-core (0.1.1) + ronin-core (0.1.2) command_kit (~> 0.4) irb (~> 1.0) reline (~> 0.1) @@ -159,7 +159,7 @@ GEM combinatorics (~> 0.4) hexdump (~> 1.0) uri-query_params (~> 0.8) - ronin-vulns (0.1.2) + ronin-vulns (0.1.3) ronin-core (~> 0.1) ronin-support (~> 1.0, >= 1.0.1) ronin-web (1.0.2) @@ -212,7 +212,7 @@ GEM webrick (1.8.1) webrobots (0.1.2) woothee (1.13.0) - wordlist (1.0.0) + wordlist (1.0.2) PLATFORMS ruby diff --git a/pkgs/tools/security/ronin/default.nix b/pkgs/tools/security/ronin/default.nix index bdde1df3699..1bf98ae9eaf 100644 --- a/pkgs/tools/security/ronin/default.nix +++ b/pkgs/tools/security/ronin/default.nix @@ -15,6 +15,11 @@ bundlerEnv { }; }; + postBuild = '' + shopt -s extglob + rm $out/bin/!(ronin*) + ''; + passthru.updateScript = bundlerUpdateScript "ronin"; meta = with lib; { diff --git a/pkgs/tools/security/ronin/gemset.nix b/pkgs/tools/security/ronin/gemset.nix index c979749c7d3..2171841a426 100644 --- a/pkgs/tools/security/ronin/gemset.nix +++ b/pkgs/tools/security/ronin/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -131,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kxcxm3ynrsv6d60r2pzbw6rzdbg506hn3536pflaf747c5y2db7"; + sha256 = "133csy1c80wh144hzr0pwcwg7i553pqn2byzsdw6kq5s0kg0pg8m"; type = "gem"; }; - version = "1.17.2"; + version = "1.18.0"; }; date = { groups = ["default"]; @@ -245,10 +245,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7ksjik7phf6ygshg9bp6ldd38dfgxmgr73yipkpqq7b426hclq"; + sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.4"; }; mechanize = { dependencies = ["addressable" "domain_name" "http-cookie" "mime-types" "net-http-digest_auth" "net-http-persistent" "nokogiri" "rubyntlm" "webrick" "webrobots"]; @@ -287,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["default"]; @@ -395,10 +395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.3"; }; nokogiri-diff = { dependencies = ["nokogiri" "tdiff"]; @@ -437,10 +437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; racc = { groups = ["default"]; @@ -490,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5rqi4b7qnwxslc54k0nnfg97842i6hmjnyy79pqyydwwcjhj0i"; + sha256 = "1rgsfxm3sb9mgsxa7gks40wy4sb41w33j30y6izmih70ss34x4dh"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; ronin = { dependencies = ["async-io" "open_namespace" "ronin-code-asm" "ronin-code-sql" "ronin-core" "ronin-db" "ronin-exploits" "ronin-fuzzer" "ronin-payloads" "ronin-repos" "ronin-support" "ronin-vulns" "ronin-web" "rouge" "wordlist"]; @@ -501,10 +501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z56vz0ndakxyngivpa6zn4ja2g5lzaz51aws9778bpcai5i300x"; + sha256 = "1ssh8hijpiw4m9pazr3gqqrlsk8bsjk200fp0m15lbnjv4hc713b"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; ronin-code-asm = { dependencies = ["ruby-yasm"]; @@ -534,10 +534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2244i8im55mm3mdj88fg98avlmzjq581aazrhcaxm7qv0cl6bh"; + sha256 = "1s2hndkdh4pw6xppq4jqn30fk2b26gk08yym5gavlzkcg5k17vvd"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; ronin-db = { dependencies = ["ronin-core" "ronin-db-activerecord" "ronin-support" "sqlite3"]; @@ -633,10 +633,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13yyn331cj8wip99s0km17v9vcx3gpyb9v4nkcmpzhg9rq5w4x57"; + sha256 = "1xw029nfxnbjs9nhnb0fgyhksismswap393zm3cnjjw46d643jl8"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; ronin-web = { dependencies = ["mechanize" "nokogiri" "nokogiri-diff" "nokogiri-ext" "open_namespace" "ronin-core" "ronin-support" "ronin-web-server" "ronin-web-spider" "ronin-web-user_agents"]; @@ -883,9 +883,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07h4kgycf72w9gbnf95d5h9zcdcgl3gjadfajjicl2xkiffvpcmf"; + sha256 = "133v1v0b8l7v7vdvyhxa2szaf1nb4hsfcqflx1avax93ah3n7ikn"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; } diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index 5487767b4a9..95d0426729e 100644 --- a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - hash = "sha256-sxjWd02INP2Dr5RQR7+dHHIQkGoCx6CZmvrq9x9zVC8="; + hash = "sha256-Qe9KKZh0Zim/BdPn2aMxkH6FBOBB6zijkp5ft9YfzzU="; }; - cargoHash = "sha256-+0MLfq2Gjs4oh9bC8OEQsx0RHxlzB/HlIgyXtwzvGUY="; + cargoHash = "sha256-KuVSpbAfLVIy5YJ/8qb+Rfw1TgZkWfR+Ai9gDcf4EQ4="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 8aaea88579f..6cf8349b09a 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , buildPackages , coreutils , pam @@ -14,13 +15,22 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.13p3"; + version = "1.9.14p3"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-kjNKEruT4MBWsJ9T4lXMt9b2fGNQ4oE82Vk87sp4Vgs="; + hash = "sha256-oIMYscS8hYLABNTNmuKQOrxUnn5GuoFeQf6B0cB4K2I="; }; + patches = [ + # Extra bugfix not included in 1.9.14p3 to address a bug that impacts the + # NixOS test suite for sudo. + (fetchpatch { + url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch"; + hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE="; + }) + ]; + prePatch = '' # do not set sticky bit in nix store substituteInPlace src/Makefile.in --replace 04755 0755 diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/tools/security/truecrack/default.nix index aebbbc79f8f..c58ce4ae57b 100644 --- a/pkgs/tools/security/truecrack/default.nix +++ b/pkgs/tools/security/truecrack/default.nix @@ -1,5 +1,6 @@ { lib, gccStdenv, fetchFromGitLab, cudatoolkit -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , pkg-config }: gccStdenv.mkDerivation rec { diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 8260978f41a..da9a7334396 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.44.0"; + version = "3.45.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-2AGdF+E3YNRiM8So+i6XWkQxgDgF8wu2z6hnuuzh4NQ="; + hash = "sha256-kWEDeFx3ngpL6ySCD5GsJbmtbhv1qCMt9yjrskLmbbg="; }; - vendorHash = "sha256-IJZSYwF71pbRr+k8dCE8OOEQwK3srPtGbrJIltfVNBU="; + vendorHash = "sha256-dg29rK5/se2DVhc+GLFeFzh3bqJl3dfC2zjGLX7utDs="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 87d4e02cb29..666a8ff4271 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-kx60OMIw7F9osF1u6GGp/xfUXo9XUhHmsrh3gCud0iI="; + sha256 = "sha256-3/oGuK+n0NGDdRYb+c0QNbJrCD2MBQDXWUDpdGsOY2k="; }; - vendorHash = "sha256-gQ+n/UtZn07lyi48sRCulZ7R4gtwKVu1tklFwRAUIZo="; + vendorHash = "sha256-W5XsUWb3uZGX7RAQQMy67j9LM3KiEl/+XZAGDKTRwd0="; subPackages = [ "." ]; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 207aadf4dca..6b48b6f642d 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.110"; + version = "1.0.116"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TIa4yGj3imDrWJ6U8Qyv84bAihhuFbQizXghJuEIc88="; + sha256 = "sha256-BS44/bN76iD659j1ISMBBw0o2uwLasd7CDJMh8LDII4="; }; - cargoHash = "sha256-0ORDDwb2wXdJXoesfcY98EgONWjovT/bE96qFVxDRcM="; + cargoHash = "sha256-tscxMeSS0BGJT7HlMrDsd3zMZXE0nUtd5qSzsSE2o/s="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 3bef287ccf0..9ca18b06203 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -1,6 +1,5 @@ { lib, stdenv , curl -, darwin , hiredis , iptables , jdk @@ -19,7 +18,6 @@ , libsigrok , libvirt , libxml2 -, libapparmor, libcap_ng, numactl , lua , lvm2 , lm_sensors diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 079b6b69436..d83e4aa383b 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchpatch, makeWrapper, coreutils }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "datefudge"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 00c5b6c68fa..441e359e13d 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ python3 zlib ] ++ lib.optional (!stdenv.isDarwin) libaio; + # ./configure does not support autoconf-style --build=/--host=. + # We use $CC instead. + configurePlatforms = [ ]; + nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython ]; strictDeps = true; diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/tools/system/gkraken/default.nix index b5bb7fd03c1..f37a21db79f 100644 --- a/pkgs/tools/system/gkraken/default.nix +++ b/pkgs/tools/system/gkraken/default.nix @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection glib gtk3 libnotify diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index c7e25e57852..1fef47933bb 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,9 +1,7 @@ { lib, fetchFromGitHub, python3Packages }: let - inherit (python3Packages) python; pname = "honcho"; - in python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index ee538f92668..501ae69dbfd 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -1,6 +1,5 @@ -{ config +{ lib , stdenv -, lib , fetchFromGitHub , makeWrapper , makePerlPath diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 0b55c3522fb..5a3450df086 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,7 +1,6 @@ -{ fetchFromGitHub -, fetchpatch -, lib +{ lib , rustPlatform +, fetchFromGitHub , withCmd ? false }: diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/tools/system/minijail/tools.nix index caaba84c083..f54e7677761 100644 --- a/pkgs/tools/system/minijail/tools.nix +++ b/pkgs/tools/system/minijail/tools.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, pkgsBuildTarget, python, minijail }: +{ lib, buildPythonApplication, pkgsBuildTarget, python, minijail }: let targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 8ccb540e4ec..665be5cbabf 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub , talloc , pkg-config -, git , ncurses , docutils, swig, python3, coreutils, enablePython ? true }: diff --git a/pkgs/tools/system/s0ix-selftest-tool/default.nix b/pkgs/tools/system/s0ix-selftest-tool/default.nix index 193fbb0aef5..f75ba42ac90 100644 --- a/pkgs/tools/system/s0ix-selftest-tool/default.nix +++ b/pkgs/tools/system/s0ix-selftest-tool/default.nix @@ -12,7 +12,6 @@ pciutils, powertop, resholve, - stdenv, util-linux, xorg, xxd, diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock index 2711be4d258..25e3c8e41fe 100644 --- a/pkgs/tools/text/difftastic/Cargo.lock +++ b/pkgs/tools/text/difftastic/Cargo.lock @@ -187,9 +187,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ "bitflags", "crossterm_winapi", @@ -217,7 +217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", - "syn", + "syn 1.0.95", ] [[package]] @@ -234,7 +234,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.48.0" +version = "0.49.0" dependencies = [ "assert_cmd", "bumpalo", @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -636,9 +636,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -774,24 +774,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.27", ] [[package]] @@ -806,6 +806,17 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "termcolor" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 86b8fd3eacd..3842fb6b147 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -16,13 +16,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-kCCORQKqt9rDydxvddD30RMQ1eS73rgvJzCCx93lRuI="; + hash = "sha256-jFBvMRkuAaQAi/28BBf/9cm6FcNMOYS5M69YoSXsX4Q="; }; cargoLock = { diff --git a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch b/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch deleted file mode 100644 index 671293cda5b..00000000000 --- a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1454525f70b43a6957b7c9e1870e997368787da3 Mon Sep 17 00:00:00 2001 -From: Samuel Dionne-Riel <samuel@dionne-riel.com> -Date: Fri, 8 Nov 2019 21:59:21 -0500 -Subject: [PATCH] Fix cross-compilation by looking for `ar`. - ---- - Makefile.am | 2 +- - configure.ac | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index d18c49b8..b1b53338 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -494,7 +494,7 @@ CCC=@CXX@ - # INSTALL_INFO - # LN_S - --AR=ar -+AR=@AR@ - ETAGS=etags - ETAGSFLAGS= - # Flag that tells etags to assume C++. -diff --git a/configure.ac b/configure.ac -index 28e75f17..2449b9f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,6 +37,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - - AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin]) - AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp]) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_USE_SYSTEM_EXTENSIONS - -@@ -72,6 +73,7 @@ GROFF_DOC_CHECK - GROFF_MAKEINFO - GROFF_TEXI2DVI - AC_PROG_RANLIB -+AC_CHECK_TOOL([AR], [ar], [ar]) - GROFF_INSTALL_SH - GROFF_INSTALL_INFO - AC_PROG_INSTALL --- -2.23.0 - diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index ae250f2efee..df06292c4f3 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -14,30 +14,16 @@ stdenv.mkDerivation rec { pname = "groff"; - version = "1.22.4"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnu/groff/${pname}-${version}.tar.gz"; - sha256 = "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7"; + hash = "sha256-a5dX9ZK3UYtJAutq9+VFcL3Mujeocf3bLTCuOGNRHBM="; }; outputs = [ "out" "man" "doc" "info" "perl" ]; - # Parallel build is failing for missing depends. Known upstream as: - # https://savannah.gnu.org/bugs/?62084 - # fixed, planned release: 1.23.0 - enableParallelBuilding = false; - - patches = [ - ./0001-Fix-cross-compilation-by-looking-for-ar.patch - ] - ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") [ - # https://trac.macports.org/ticket/59783 - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/ce265cf467f1c3e5ba2edbfbef2170df1a727a52/meta/recipes-extended/groff/files/0001-Include-config.h.patch"; - sha256 = "1b0mg31xkpxkzlx696nr08rcc7ndpaxdplvysy0hw5099c4n1wyf"; - }) - ]; + enableParallelBuilding = true; postPatch = '' # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs @@ -53,8 +39,7 @@ stdenv.mkDerivation rec { --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \ --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" - substituteInPlace contrib/groffer/roff2.pl \ - --replace "'gs'" "'${lib.getBin ghostscript}/bin/gs'" + '' + lib.optionalString (enableGhostscript || enableHtml) '' substituteInPlace contrib/pdfmark/pdfroff.sh \ --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \ --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk" @@ -119,11 +104,6 @@ stdenv.mkDerivation rec { substituteInPlace $perl/bin/gpinyin \ --replace $out/lib/groff/gpinyin $perl/lib/groff/gpinyin - moveToOutput bin/groffer $perl - moveToOutput lib/groff/groffer $perl - substituteInPlace $perl/bin/groffer \ - --replace $out/lib/groff/groffer $perl/lib/groff/groffer - moveToOutput bin/grog $perl moveToOutput lib/groff/grog $perl substituteInPlace $perl/bin/grog \ diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/tools/text/groff/site.tmac index 776a7abb1da..07923f12000 100644 --- a/pkgs/tools/text/groff/site.tmac +++ b/pkgs/tools/text/groff/site.tmac @@ -9,11 +9,5 @@ . char \' \N'39' . \} . -. \" Shut off SGR by default (groff colors) -. \" Require GROFF_SGR envvar defined to turn it on -. if '\V[GROFF_SGR]'' \ -. output x X tty: sgr 0 -.\} -. .ds doc-default-operating-system Nixpkgs .ds doc-volume-operating-system Nixpkgs diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index fb16526da30..2f9035bf87d 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.8.7"; + version = "1.9.3"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-lXyluCezwg3QVYH7zctQy0yDIvGzqMPdabRh5Z7Yw/8="; + hash = "sha256-cQO34m78lvgfbDf+Ok0Yo3rnou8ndGfegeIy1Z8xuPU="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; diff --git a/pkgs/tools/text/textpieces/default.nix b/pkgs/tools/text/textpieces/default.nix index d9bd7a07b82..9cea993710a 100644 --- a/pkgs/tools/text/textpieces/default.nix +++ b/pkgs/tools/text/textpieces/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 appstream-glib desktop-file-utils + gobject-introspection ]; buildInputs = [ @@ -54,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { libgee json-glib gtksourceview5 - gobject-introspection ]; runtimeDependencies = [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 645ab6e62d8..4fc1c8c52f6 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.28.0"; + version = "2.28.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-AalZFc2GGIA7CV3+OGEmNZEQk0OUsbfQDq8d3Z708XU="; + hash = "sha256-40JCZo7wxI2ysquW/r+LEcC+TUdmBEHak8b3AcmNq4c="; }; vendorHash = "sha256-KB1mRWDYejc38tUv316MiGfmq2riNnpEMIUpjgfSasU="; @@ -27,8 +27,9 @@ buildGoModule rec { doCheck = false; meta = with lib; { - homepage = "https://vale.sh/"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; + homepage = "https://vale.sh/"; + changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e4c904fffbc..3a108d7c8ed 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook -, enableShared ? !(stdenv.hostPlatform.isStatic) +, enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic # for passthru.tests , nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = let - inherit (stdenv.hostPlatform.extensions) sharedLibrary; soVersion = "3"; in diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 16fe6c579c0..8b341298f31 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages +{ lib, fetchFromGitHub, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let - camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { + camlpdf = ocamlPackages.camlpdf.overrideAttrs { src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; rev = "v2.3.1+satysfi"; sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; - }); + }; otfm = ocamlPackages.otfm.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/tools/typesetting/tex/mftrace/default.nix index 9f061630e22..4b8a0350c8b 100644 --- a/pkgs/tools/typesetting/tex/mftrace/default.nix +++ b/pkgs/tools/typesetting/tex/mftrace/default.nix @@ -3,7 +3,6 @@ , lib , makeWrapper , autoreconfHook -, buildEnv , python3 , fontforge , potrace diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix index fe08d682339..4fd32aadf8c 100644 --- a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix +++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "pgf-umlcd"; version = "unstable-2020-05-28"; @@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -}) +} diff --git a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md index 12416dee8ce..c9d4a81a2c3 100644 --- a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md +++ b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md @@ -72,6 +72,23 @@ CTAN and the various mirrors) and that the build recipe continues to produce the same output. Should those assumptions not hold, remove the previous fixed hashes for the relevant package, or for all packages. +### Updating the licensing information + +The license of each package in texlive is automatically extracted from texlive's +texlive.tlpdb into tlpdb.nix. The combined licenses of the schemes is stored +separately in `default.nix` and must be kept in sync with the licenses of the +actual contents of these schemes. Whether this is the case can be verified with the +`pkgs.tests.texlive.licenses` test. In case of a mismatch, copy the “correct” +license lists reported by the test into `default.nix`. + +### Running the testsuite + +There are a some other useful tests that haven't been mentioned before. Build them with +``` +nix-build ../../../../.. -A tests.texlive --no-out-link +``` + + ### Commit changes Commit the updated `tlpdb.nix` and `fixed-hashes.nix` to the repository with diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 008b519cd83..38a26721abf 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -103,7 +103,7 @@ in (buildEnv { passthru = { # This is set primarily to help find-tarballs.nix to do its job packages = pkgList.all; - # useful for inclusion in the `fonts.fonts` nixos option or for use in devshells + # useful for inclusion in the `fonts.packages` nixos option or for use in devshells fonts = "${texmfroot}/texmf-dist/fonts"; }; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 6ed1ba7e794..f5696eba4f9 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -43,6 +43,7 @@ let # it seems to need it to transform fonts xdvi.deps = (orig.xdvi.deps or []) ++ [ "metafont" ]; + # TODO: remove when updating to texlive-2023, metadata has been corrected in the TeX catalogue # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README arabi-add.license = [ "lppl13c" ]; @@ -254,13 +255,38 @@ in # Pre-defined combined packages for TeX Live schemes, # to make nix-env usage more comfortable and build selected on Hydra. - combined = with lib; recurseIntoAttrs ( + combined = with lib; + let + # these license lists should be the sorted union of the licenses of the packages the schemes contain. + # The correctness of this collation is tested by tests.texlive.licenses + licenses = with lib.licenses; { + scheme-basic = [ free gfl gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-context = [ bsd2 bsd3 cc-by-sa-40 free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 + lppl1 lppl13c mit ofl publicDomain x11 ]; + scheme-full = [ artistic1 artistic1-cl8 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-40 cc-by-sa-10 cc-by-sa-20 + cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl1Plus gpl2 gpl2Plus gpl3 gpl3Plus isc knuth + lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 + gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-infraonly = [ gpl2 lgpl21 ]; + scheme-medium = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only + free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl + publicDomain x11 ]; + scheme-minimal = [ free gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth + lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-tetex = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 + fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a + lppl13c mit ofl publicDomain x11]; + }; + in recurseIntoAttrs ( mapAttrs (pname: attrs: addMetaAttrs rec { description = "TeX Live environment for ${pname}"; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.${pname}; } (combine { ${pname} = attrs; diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index 49d431285ac..9b2a9a7be03 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/pkgs/tools/video/wtwitch/default.nix @@ -10,24 +10,22 @@ , makeWrapper , mplayer , mpv -, ncurses , procps , scdoc , stdenv , streamlink -, sudo , vlc }: stdenv.mkDerivation rec { pname = "wtwitch"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "krathalan"; repo = pname; rev = version; - hash = "sha256-kXUocEBxEyjWOEUPVO1oPWEu7MAVoD2r4Umi1LPNKjc="; + hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw="; }; # hardcode SCRIPT_NAME because #150841 diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index f9828abe629..01b05b5481f 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi, glibcLocales, docker-compose_1 }: +{ lib, python3, fetchFromGitHub, glibcLocales, docker-compose_1, git }: let docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override { inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; @@ -18,56 +18,29 @@ let cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE="; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ="; - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.4.1"; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib3:$PYTHONPATH" ${localPython.interpreter} -m test_all - runHook postCheck - ''; - src = fetchPypi { - pname = "PyYAML"; - inherit version; - hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; - }; - }); }; }; in with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; version = "3.20.7"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hnLWqc4UzUnvz4wmKZ8JcEWUMPmh2BdQS1IAyxC+yb4="; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-elastic-beanstalk-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-DxjoEkFnY4aSfxVKPpnJLmnjLtZnlM74XXd0K8mcdoY="; }; - - preConfigure = '' - substituteInPlace requirements.txt \ - --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ - --replace "pathspec==0.10.1" "pathspec>=0.10.0,<1" \ - --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ - --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<3" - ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; buildInputs = [ glibcLocales ]; - nativeCheckInputs = [ - pytest - mock - nose - pathspec - colorama - requests - docutils - ]; - - doCheck = true; - propagatedBuildInputs = [ blessed botocore @@ -85,6 +58,38 @@ with localPython.pkgs; buildPythonApplication rec { docker_compose ]; + pythonRelaxDeps = [ + "botocore" + "colorama" + "pathspec" + "PyYAML" + "six" + "termcolor" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-socket + mock + git + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + disabledTests = [ + # Needs docker installed to run. + "test_local_run" + "test_local_run__with_arguments" + + # Needs access to the user's ~/.ssh directory. + "test_generate_and_upload_keypair__exit_code_0" + "test_generate_and_upload_keypair__exit_code_1" + "test_generate_and_upload_keypair__exit_code_is_other_than_1_and_0" + "test_generate_and_upload_keypair__ssh_keygen_not_present" + ]; + meta = with lib; { homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a6ae67b07e7..ac65ea3f54b 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { patches = [ # go.mod update: needed to to include a newer lxd which contains - # https://github.com/lxc/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52 + # https://github.com/canonical/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52 # which is needed to fix the build w/glibc-2.36. (fetchpatch { url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch"; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index ad187544aea..c980a45bbef 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , bash , bashInteractive -, systemd , util-linux , boto , setuptools diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index f531b5ca84a..f34a56f5d14 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, fetchpatch, lib, coreutils, makeWrapper +{ buildGoModule, fetchFromGitHub, lib, coreutils, makeWrapper , google-guest-configs, google-guest-oslogin, iproute2, dhcp, procps }: diff --git a/pkgs/tools/virtualization/google-guest-configs/default.nix b/pkgs/tools/virtualization/google-guest-configs/default.nix index dd3c01c6229..73dd3c93d25 100644 --- a/pkgs/tools/virtualization/google-guest-configs/default.nix +++ b/pkgs/tools/virtualization/google-guest-configs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll +{ stdenv, lib, fetchFromGitHub, makeWrapper , ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 68ca58fb64f..84e6a865dcd 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -1,6 +1,5 @@ -{ stdenv -, lib -, bashInteractive +{ lib +, stdenv , curl , fetchFromGitHub , json_c diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index bbd80391c7a..5f501647783 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} -, requireFile, autoPatchelfHook, makeWrapper, unzip +, autoPatchelfHook, makeWrapper, unzip , glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib }: diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 8a57fd58103..3d74344a4e7 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkgs , pam , scdoc , gtk3 diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index 3f98e8ef8c2..51edcc0ea3a 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , meson -, cmake , ninja , wlroots , wayland diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 2bd2dbcf7e3..3555af7c042 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; version = "0.8.1"; diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index dd2e6502bc8..646ed369850 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -10,7 +10,6 @@ , wayland-protocols , wl-clipboard , libxkbcommon -, cmake , libressl }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/tools/wayland/wayout/default.nix index 041c3dfe8cc..ca3a3f41911 100644 --- a/pkgs/tools/wayland/wayout/default.nix +++ b/pkgs/tools/wayland/wayout/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromSourcehut , rustPlatform +, fetchFromSourcehut }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix index 923391b7995..141e2e11d02 100644 --- a/pkgs/tools/wayland/wl-clipboard/default.nix +++ b/pkgs/tools/wayland/wl-clipboard/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wl-clipboard"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; rev = "v${version}"; - sha256 = "sha256-lqtLHLsSChWcYWsfFigj0Xveo9doAr7G31fRSaxm0Lw="; + hash = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wlay/default.nix b/pkgs/tools/wayland/wlay/default.nix index a766a49d25d..3a80e0627e3 100644 --- a/pkgs/tools/wayland/wlay/default.nix +++ b/pkgs/tools/wayland/wlay/default.nix @@ -15,7 +15,7 @@ , wayland-scanner }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "wlay"; version = "unstable-2022-01-26"; @@ -54,4 +54,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -}) +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7ac9b47e8bd..94f3271668b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -850,6 +850,7 @@ mapAliases ({ larynx = piper-tts; # Added 2023-05-09 lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; + ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 lfs = dysk; # Added 2023-07-03 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 @@ -1451,6 +1452,7 @@ mapAliases ({ qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 @@ -1668,6 +1670,7 @@ mapAliases ({ tdesktop = telegram-desktop; # Added 2023-04-07 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 + telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4104fe62d6d..5dc4e4c0de5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,6 +411,8 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; + catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; + catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; @@ -425,7 +427,9 @@ with pkgs; ccal = callPackage ../tools/misc/ccal { }; - cereal = callPackage ../development/libraries/cereal { }; + cereal = cereal_1_3_0; + cereal_1_3_0 = callPackage ../development/libraries/cereal/1.3.0.nix { }; + cereal_1_3_2 = callPackage ../development/libraries/cereal/1.3.2.nix { }; cdecrypt = callPackage ../development/tools/cdecrypt { }; @@ -553,6 +557,8 @@ with pkgs; dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; + dcgm = callPackage ../os-specific/linux/dcgm { }; + dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; @@ -573,6 +579,8 @@ with pkgs; dec-decode = callPackage ../development/tools/dec-decode { }; + devour-flake = callPackage ../tools/nix/devour-flake { }; + dnf5 = callPackage ../tools/package-management/dnf5 { }; dsq = callPackage ../tools/misc/dsq { }; @@ -3053,9 +3061,7 @@ with pkgs; apksigner = callPackage ../development/tools/apksigner { }; - apktool = callPackage ../development/tools/apktool { - inherit (androidenv.androidPkgs_9_0) build-tools; - }; + apktool = callPackage ../development/tools/apktool { }; appimage-run = callPackage ../tools/package-management/appimage-run { }; appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix { @@ -3252,6 +3258,10 @@ with pkgs; blanket = callPackage ../applications/audio/blanket { }; + blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp { + inherit (darwin.apple_sdk_11_0.frameworks) IOKit; + }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; @@ -3804,6 +3814,8 @@ with pkgs; kavita = callPackage ../servers/web-apps/kavita { }; + keka = callPackage ../tools/compression/keka { }; + kord = callPackage ../applications/misc/kord { }; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; @@ -4203,7 +4215,7 @@ with pkgs; libtensorflow = python3.pkgs.tensorflow.libtensorflow; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { - cudaSupport = config.cudaSupport or false; + inherit (config) cudaSupport; }; tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; @@ -4562,7 +4574,9 @@ with pkgs; cowsay = callPackage ../tools/misc/cowsay { }; - czkawka = callPackage ../tools/misc/czkawka { }; + czkawka = callPackage ../tools/misc/czkawka { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; cherrytree = callPackage ../applications/misc/cherrytree { }; @@ -4894,6 +4908,8 @@ with pkgs; disk-filltest = callPackage ../tools/system/disk-filltest { }; + disk-inventory-x = callPackage ../tools/filesystems/disk-inventory-x { }; + diskscan = callPackage ../tools/misc/diskscan { }; disorderfs = callPackage ../tools/filesystems/disorderfs { @@ -5732,6 +5748,8 @@ with pkgs; maxcso = callPackage ../tools/archivers/maxcso { }; + measureme = callPackage ../development/tools/rust/measureme { }; + medusa = callPackage ../tools/security/medusa { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { @@ -7381,6 +7399,8 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; + a4term = callPackage ../tools/misc/a4term { }; + ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; erofs-utils = callPackage ../tools/filesystems/erofs-utils { }; @@ -9206,7 +9226,7 @@ with pkgs; ispike = callPackage ../development/libraries/science/robotics/ispike { }; - isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; @@ -9234,9 +9254,7 @@ with pkgs; usePulseaudio = true; }; - jaq = callPackage ../development/tools/jaq { - inherit (darwin.apple_sdk.frameworks) Security; - }; + jaq = callPackage ../development/tools/jaq { }; jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; @@ -9289,6 +9307,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + stalwart-mail = callPackage ../servers/mail/stalwart { }; + jmespath = callPackage ../development/tools/jmespath { }; juicefs = callPackage ../tools/filesystems/juicefs { }; @@ -9494,6 +9514,8 @@ with pkgs; klystrack = callPackage ../applications/audio/klystrack { }; + knit = callPackage ../development/tools/build-managers/knit { }; + knockpy = callPackage ../tools/security/knockpy { }; kool = callPackage ../development/tools/misc/kool { }; @@ -9570,10 +9592,6 @@ with pkgs; coq = coq_8_14; }; - ldgallery = callPackage ../tools/graphics/ldgallery { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - lego = callPackage ../tools/admin/lego { }; leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; @@ -10257,6 +10275,8 @@ with pkgs; lmp = callPackage ../tools/security/lmp { }; + localproxy = callPackage ../applications/networking/localproxy { }; + localstack = with python3Packages; toPythonApplication localstack; localtime = callPackage ../tools/system/localtime { }; @@ -10599,12 +10619,16 @@ with pkgs; motrix = callPackage ../tools/networking/motrix { }; + mount-zip = callPackage ../tools/filesystems/mount-zip { }; + mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; mpw = callPackage ../tools/security/mpw { }; + mqtt_cpp = callPackage ../development/libraries/mqtt_cpp { }; + mr = callPackage ../applications/version-management/mr { }; mrsh = callPackage ../shells/mrsh { }; @@ -10898,7 +10922,7 @@ with pkgs; nvidia-thrust-intel = callPackage ../development/libraries/nvidia-thrust { hostSystem = "TBB"; - deviceSystem = if config.cudaSupport or false then "CUDA" else "TBB"; + deviceSystem = if config.cudaSupport then "CUDA" else "TBB"; }; nvidia-thrust-cuda = callPackage ../development/libraries/nvidia-thrust { @@ -11949,6 +11973,8 @@ with pkgs; pscircle = callPackage ../os-specific/linux/pscircle { }; + psitop = callPackage ../applications/system/psitop { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -11959,6 +11985,8 @@ with pkgs; psutils = callPackage ../tools/typesetting/psutils { }; + psudohash = callPackage ../tools/security/psudohash { }; + psensor = callPackage ../tools/system/psensor { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; @@ -12475,6 +12503,8 @@ with pkgs; rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; + rtz = callPackage ../tools/misc/rtz { }; + rubber = callPackage ../tools/typesetting/rubber { }; rubocop = rubyPackages.rubocop; @@ -12513,7 +12543,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - rustdesk-server = callPackage ../servers/rustdesk-server { }; + rustdesk-server = callPackage ../servers/rustdesk-server { + inherit (darwin.apple_sdk.frameworks) Security; + }; rustypaste = callPackage ../servers/rustypaste { }; @@ -14190,6 +14222,8 @@ with pkgs; woodpecker-pipeline-transform = callPackage ../development/tools/continuous-integration/woodpecker-pipeline-transform { }; + woodpecker-plugin-git = callPackage ../development/tools/continuous-integration/woodpecker-plugin-git { }; + woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { woodpecker-frontend = callPackage ../development/tools/continuous-integration/woodpecker/frontend.nix { }; }; @@ -14342,6 +14376,8 @@ with pkgs; unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; + unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { }; + unrar = callPackage ../tools/archivers/unrar { }; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; @@ -15155,7 +15191,7 @@ with pkgs; colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { cudaSupport = config.cudaSupport or false; }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmapWithCuda = colmap.override { cudaSupport = true; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; @@ -15554,7 +15590,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.8" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "4.8"); isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -15568,7 +15604,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.9" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "4.9"); isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -15585,7 +15621,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "6" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "6"); # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15604,7 +15640,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "7" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "7"); # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15619,7 +15655,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "8" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "8"); # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15634,7 +15670,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "9" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "9"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15646,7 +15682,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "10" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "10"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15658,7 +15694,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "11" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "11"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15670,7 +15706,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "12" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "12"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -16045,6 +16081,10 @@ with pkgs; hop = callPackage ../development/compilers/hop { }; + hop-cli = callPackage ../tools/admin/hop-cli { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + falcon = callPackage ../development/interpreters/falcon { stdenv = gcc10Stdenv; }; @@ -16242,6 +16282,8 @@ with pkgs; kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; + kingstvis = callPackage ../applications/science/electronics/kingstvis { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; regenkfs = callPackage ../development/tools/knightos/regenkfs { }; @@ -17479,6 +17521,8 @@ with pkgs; dhall-nixpkgs = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-nixpkgs; + dhall-yaml = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-yaml; + dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); duktape = callPackage ../development/interpreters/duktape { }; @@ -17895,9 +17939,9 @@ with pkgs; rbenv = callPackage ../development/ruby-modules/rbenv { }; - inherit (callPackage ../development/interpreters/ruby { + inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; - inherit (darwin.apple_sdk.frameworks) Foundation; + inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }) mkRubyVersion mkRuby @@ -19666,11 +19710,7 @@ with pkgs; qc = callPackage ../development/tools/qc { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { - inherit (linuxPackages) perf; - }; - - qtcreator-qt6 = qt6Packages.callPackage ../development/tools/qtcreator/qt6.nix { + qtcreator = qt6Packages.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; stdenv = llvmPackages_14.stdenv; llvmPackages = llvmPackages_14; @@ -19790,6 +19830,8 @@ with pkgs; saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; + samply = callPackage ../development/tools/misc/samply { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; sawjap = callPackage ../development/tools/java/sawjap { }; @@ -19918,6 +19960,8 @@ with pkgs; spruce = callPackage ../development/tools/misc/spruce { }; + sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { }; + sqlc = callPackage ../development/tools/database/sqlc { }; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -20178,6 +20222,8 @@ with pkgs; xeus = callPackage ../development/libraries/xeus { }; + xeus-zmq = callPackage ../development/libraries/xeus-zmq { }; + xmlindent = callPackage ../development/web/xmlindent { }; xpwn = callPackage ../development/mobile/xpwn { }; @@ -21227,6 +21273,8 @@ with pkgs; graphinder = callPackage ../tools/security/graphinder { }; + hnswlib = callPackage ../development/libraries/hnswlib { }; + httplib = callPackage ../development/libraries/httplib { }; icon-lang = callPackage ../development/interpreters/icon-lang { }; @@ -21349,8 +21397,7 @@ with pkgs; threadsCross = threadsCrossFor null; threadsCrossFor = cc_version: - if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) - then { + lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) { # other possible values: win32 or posix model = "mcf"; # For win32 or posix set this to null @@ -21358,7 +21405,7 @@ with pkgs; if cc_version == null || lib.versionAtLeast cc_version "13" then targetPackages.windows.mcfgthreads or windows.mcfgthreads else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13; - } else { }; + }; wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; @@ -21919,8 +21966,8 @@ with pkgs; isort = with python3Packages; toPythonApplication isort; ispc = callPackage ../development/compilers/ispc { - inherit (llvmPackages) stdenv; xcode = darwin.xcode_14; + llvmPackages = llvmPackages_14; }; isso = callPackage ../servers/isso { @@ -24986,7 +25033,11 @@ with pkgs; taskflow = callPackage ../development/libraries/taskflow { }; - tclap = callPackage ../development/libraries/tclap { }; + tclap = tclap_1_2; + + tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { }; + + tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; tcllib = callPackage ../development/libraries/tcllib { }; @@ -25758,14 +25809,14 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl534 perl536 perldevel; + inherit (perlInterpreters) perl536 perl538 perldevel; - perl534Packages = recurseIntoAttrs perl534.pkgs; perl536Packages = recurseIntoAttrs perl536.pkgs; + perl538Packages = recurseIntoAttrs perl538.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl536; - perlPackages = perl536Packages; + perl = perl538; + perlPackages = perl538Packages; ack = perlPackages.ack; @@ -26816,6 +26867,7 @@ with pkgs; prometheus-cloudflare-exporter = callPackage ../servers/monitoring/prometheus/cloudflare-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; + prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; @@ -27836,8 +27888,6 @@ with pkgs; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; - linuxPackages_6_3_hardened = linuxKernel.packages.linux_6_3_hardened; - linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened; linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened; linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; @@ -28768,6 +28818,8 @@ with pkgs; bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; + banana-cursor = callPackage ../data/icons/banana-cursor { }; + barlow = callPackage ../data/fonts/barlow { }; base16-schemes = callPackage ../data/themes/base16-schemes { }; @@ -30706,6 +30758,8 @@ with pkgs; cwm = callPackage ../applications/window-managers/cwm { }; + cyberduck = callPackage ../applications/networking/cyberduck { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; dablin = callPackage ../applications/radio/dablin { }; @@ -30795,6 +30849,8 @@ with pkgs; dnd-tools = callPackage ../applications/misc/dnd-tools { }; + dnglab = callPackage ../tools/graphics/dnglab { }; + inherit (callPackage ../applications/virtualization/docker {}) docker_20_10; @@ -31282,6 +31338,8 @@ with pkgs; globe-cli = callPackage ../applications/misc/globe-cli { }; + gnmic = callPackage ../applications/networking/gnmic { }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -31732,6 +31790,7 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; gum = callPackage ../applications/misc/gum { }; + pop = callPackage ../applications/misc/pop { }; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc swftools; @@ -33552,6 +33611,7 @@ with pkgs; } // (config.mplayer or {})); mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { + stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; }; @@ -35067,6 +35127,8 @@ with pkgs; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; + soundsource = callPackage ../applications/audio/soundsource { }; + sox = callPackage ../applications/misc/audio/sox { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; @@ -35289,8 +35351,6 @@ with pkgs; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; - tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; @@ -35388,6 +35448,8 @@ with pkgs; tickrs = callPackage ../applications/misc/tickrs { }; + tijolo = callPackage ../applications/editors/tijolo { }; + tilemaker = callPackage ../applications/misc/tilemaker { }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { @@ -35956,22 +36018,20 @@ with pkgs; wapiti = callPackage ../tools/security/wapiti { }; - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); - inherit (wayfireApplications) wayfire wcm; - wayfireApplications-unwrapped = recurseIntoAttrs ( - (callPackage ../applications/window-managers/wayfire/applications.nix { }). - extend (_: _: { wlroots = wlroots_0_16; }) - ); - wayfirePlugins = recurseIntoAttrs ( - callPackage ../applications/window-managers/wayfire/plugins.nix { - inherit (wayfireApplications-unwrapped) wayfire; - } - ); - weave-gitops = callPackage ../applications/networking/cluster/weave-gitops { }; + wayfire = callPackage ../applications/window-managers/wayfire/default.nix { + wlroots = wlroots_0_16; + }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; + wayfirePlugins = recurseIntoAttrs ( + callPackage ../applications/window-managers/wayfire/plugins.nix { } + ); + wayfire-with-plugins = callPackage ../applications/window-managers/wayfire/wrapper.nix { + plugins = with wayfirePlugins; [ wcm wf-shell ]; + }; + waypipe = callPackage ../applications/networking/remote/waypipe { }; wayv = callPackage ../tools/X11/wayv { }; @@ -37417,6 +37477,8 @@ with pkgs; hyperrogue = callPackage ../games/hyperrogue { }; + ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; }; + icbm3d = callPackage ../games/icbm3d { }; infra = callPackage ../tools/admin/infra { }; @@ -38179,6 +38241,8 @@ with pkgs; hhexen = callPackage ../games/hhexen { }; + hheretic = callPackage ../games/hheretic { }; + wyvern = callPackage ../games/wyvern { }; hsetroot = callPackage ../tools/X11/hsetroot { }; @@ -39330,7 +39394,7 @@ with pkgs; ### SCIENCE / MATH caffe = callPackage ../applications/science/math/caffe ({ - cudaSupport = config.cudaSupport or false; + inherit (config) cudaSupport; cudaPackages = cudaPackages_10_1; opencv3 = opencv3WithoutCuda; # Used only for image loading. blas = openblas; @@ -39345,7 +39409,7 @@ with pkgs; stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. - cudaSupport = config.cudaSupport or false; + inherit (config) cudaSupport; }; dap = callPackage ../applications/science/math/dap { }; @@ -39786,6 +39850,8 @@ with pkgs; aaphoto = callPackage ../tools/graphics/aaphoto { }; + aapt = callPackage ../development/tools/aapt { }; + flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; @@ -39884,6 +39950,10 @@ with pkgs; helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile { + inherit (kubernetes-helm-wrapped.passthru) pluginsDir; + }; + helm-dashboard = callPackage ../applications/networking/cluster/helm-dashboard { }; helmsman = callPackage ../applications/networking/cluster/helmsman { }; @@ -40259,6 +40329,10 @@ with pkgs; alejandra = callPackage ../tools/nix/alejandra { }; + nixci = callPackage ../tools/nix/nixci { + inherit (darwin.apple_sdk.frameworks) Security; + }; + nixfmt = haskellPackages.nixfmt.bin; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -41541,7 +41615,18 @@ with pkgs; charasay = callPackage ../tools/misc/charasay { }; + libvoikko = callPackage ../development/libraries/libvoikko { }; + + hfst = callPackage ../development/libraries/hfst { }; + + omorfi = callPackage ../development/libraries/omorfi { }; + + hfst-ospell = callPackage ../development/libraries/hfst-ospell { }; + waylyrics = callPackage ../applications/audio/waylyrics { }; gitrs = callPackage ../tools/misc/gitrs { }; + + wttrbar = callPackage ../applications/misc/wttrbar { }; + } diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 42053ce95de..5e25231d957 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -117,6 +117,12 @@ let ''; }; + cudaSupport = mkMassRebuild { + type = types.bool; + default = false; + feature = "build packages with CUDA support by default"; + }; + showDerivationWarnings = mkOption { type = types.listOf (types.enum [ "maintainerless" ]); default = []; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index e83f18786f1..c3685280430 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -26,7 +26,11 @@ let category-theory = callPackage ../development/coq-modules/category-theory { }; ceres = callPackage ../development/coq-modules/ceres {}; Cheerios = callPackage ../development/coq-modules/Cheerios {}; - CoLoR = callPackage ../development/coq-modules/CoLoR {}; + CoLoR = callPackage ../development/coq-modules/CoLoR ( + (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") { + bignums = self.bignums.override { version = "8.13.0"; }; + }) + ); compcert = callPackage ../development/coq-modules/compcert { inherit fetchpatch makeWrapper coq2html lib stdenv; }; @@ -36,7 +40,11 @@ let coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; coq-lsp = callPackage ../development/coq-modules/coq-lsp {}; coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; - coqeal = callPackage ../development/coq-modules/coqeal {}; + coqeal = callPackage ../development/coq-modules/coqeal ( + (lib.optionalAttrs (lib.versions.range "8.13" "8.14" self.coq.coq-version) { + bignums = self.bignums.override { version = "${self.coq.coq-version}.0"; }; + }) + ); coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqide = callPackage ../development/coq-modules/coqide {}; coqprime = callPackage ../development/coq-modules/coqprime {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8a87f955480..9adf0f20ab0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -175,13 +175,6 @@ in { ]; }; - linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -266,7 +259,6 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; - linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { }; linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; } // lib.optionalAttrs config.allowAliases { @@ -275,6 +267,7 @@ in { linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; + linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -578,7 +571,6 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); - linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -586,6 +578,7 @@ in { linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 + linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 }; rtPackages = { @@ -617,7 +610,6 @@ in { linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); - linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened); linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8193fd271b1..54d25119ac8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1705,10 +1705,10 @@ with self; { BKeywords = buildPerlPackage rec { pname = "B-Keywords"; - version = "1.24"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.24.tar.gz"; - hash = "sha256-pc9rsoXQbRfO4id4O3I7snQhP9QVOl3uMR0kDhFpYG4="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.26.tar.gz"; + hash = "sha256-LaoVXS8mf7De3Yf4pMT7VmOHn8EGUXse4lg1Pvh67TQ="; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -15217,10 +15217,10 @@ with self; { MIMECharset = buildPerlPackage { pname = "MIME-Charset"; - version = "1.012.2"; + version = "1.013.1"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz"; - hash = "sha256-h4x3nAJWxZFma9BsDN5MDXgg7uuY/RGDCCrumh57HRM="; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.013.1.tar.gz"; + hash = "sha256-G7em4MDSUfI9bmC/hMmt78W3TuxYR1v+5NORB+YIcPA="; }; meta = { description = "Charset Information for MIME"; @@ -15464,6 +15464,20 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; }; + postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # for unknown reason, the first run of Build fails + ./Build || true + ''; + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # remove version check since miniperl uses a stub of File::Temp, which do not provide a version: + # https://github.com/arsv/perl-cross/blob/master/cnf/stub/File/Temp.pm + sed -i '/File::Temp/d' \ + Build.PL + + # fix discover perl function, it can not handle a wrapped perl + sed -i "s,\$self->_discover_perl_interpreter,'$(type -p perl)',g" \ + lib/Module/Build/Base.pm + ''; meta = { description = "Build and install Perl modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23588,10 +23602,10 @@ with self; { Test2Harness = buildPerlPackage { pname = "Test2-Harness"; - version = "1.000042"; + version = "1.000152"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz"; - hash = "sha256-qvIxporxpv/WoRGIh1/PVy43PkPIKFlFInudaHtD2y0="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000152.tar.gz"; + hash = "sha256-iIqWAdvTPuuaSTcdZmK7JE8Ad/QJlM4gvJClvlSRqls="; }; checkPhase = '' @@ -23599,7 +23613,7 @@ with self; { ./scripts/yath test -j $NIX_BUILD_CORES ''; - propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ]; + propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite YAMLTiny gotofile ]; meta = { description = "A new and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -24997,10 +25011,10 @@ with self; { TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302183"; + version = "1.302195"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302183.tar.gz"; - hash = "sha256-mgO9pexCCuqWkrZQQ39NW1dPpQX91/9gzbXz7ANBBv8="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"; + hash = "sha256-s5C7I1kuC5Rsla27PDCxG8Y0ooayhHvmEa2SnFfjmmw="; }; meta = { description = "Basic utilities for writing tests"; @@ -25224,10 +25238,10 @@ with self; { TestWithoutModule = buildPerlPackage { pname = "Test-Without-Module"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz"; - hash = "sha256-jprrfDKmxtC4qTEU2yqMBychJzqdmi3U+cqGz9KKpSQ="; + url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.21.tar.gz"; + hash = "sha256-PN6vraxIU+vq/miTRtVV2l36PPqdTITj5ee/7lC+7EY="; }; meta = { description = "Test fallback behaviour in absence of modules"; @@ -25984,10 +25998,10 @@ with self; { TestTrap = buildPerlModule { pname = "Test-Trap"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz"; - hash = "sha256-CwRlbzO2yW2o7sTP/lKGFQtOS14pkdOINoaxCRAQWuI="; + url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.5.tar.gz"; + hash = "sha256-VPmQFlYrWx1yEQEA8fK+Q3F4zfhDdvSV/9A3bx1+y5o="; }; propagatedBuildInputs = [ DataDump ]; meta = { @@ -27987,12 +28001,12 @@ with self; { XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.25"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.25.tar.gz"; - hash = "sha256-9e2zDPfH8iDQxsMdwetVQDKECpnHwpgxT1zD/vZscsc="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.34.tar.gz"; + hash = "sha256-EDPdtAmSTZ1Cs4MEodeXRaBDSrxrBJHrErbIu5bx1sE="; }; - buildInputs = [ ExtUtilsCChecker ]; + buildInputs = [ ExtUtilsCChecker Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8aa2b0d21b7..6ea77736ec0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,10 @@ mapAliases ({ django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 + django_classytags = django-classy-tags; # added 2023-07-25 + django_colorful = django-colorful; # added 2023-07-25 + django_compat = django-compat; # added 2023-07-25 + django_contrib_comments = django-contrib-comments; # added 2023-07-25 django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 @@ -93,10 +97,14 @@ mapAliases ({ django_hijack_admin = django-hijack-admin; # added 2023-05-16 django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 + django_nose = django-nose; # added 2023-07-25 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 + django_silk = django-silk; # added 2023-07-25 + django_tagging = django-tagging; # added 2023-07-25 django_taggit = django-taggit; # added 2021-10-11 + django_treebeard = django-treebeard; # added 2023-07-25 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 @@ -194,6 +202,7 @@ mapAliases ({ mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 + nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 @@ -368,4 +377,5 @@ mapAliases ({ zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; + zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 726c23a090f..206984bd7a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12,6 +12,8 @@ self: super: with self; { setuptools = callPackage ../development/python-modules/setuptools { }; + a2wsgi = callPackage ../development/python-modules/a2wsgi { }; + aadict = callPackage ../development/python-modules/aadict { }; aafigure = callPackage ../development/python-modules/aafigure { }; @@ -194,6 +196,8 @@ self: super: with self; { aiogithubapi = callPackage ../development/python-modules/aiogithubapi { }; + aiogram = callPackage ../development/python-modules/aiogram { }; + aioharmony = callPackage ../development/python-modules/aioharmony { }; aiohomekit = callPackage ../development/python-modules/aiohomekit { }; @@ -510,6 +514,8 @@ self: super: with self; { ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { }; + ansi = callPackage ../development/python-modules/ansi { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; @@ -732,6 +738,8 @@ self: super: with self; { async-dns = callPackage ../development/python-modules/async-dns { }; + async-interrupt = callPackage ../development/python-modules/async-interrupt { }; + async-lru = callPackage ../development/python-modules/async-lru { }; async-modbus = callPackage ../development/python-modules/async-modbus { }; @@ -1316,6 +1324,8 @@ self: super: with self; { beniget = callPackage ../development/python-modules/beniget { }; + bentoml = callPackage ../development/python-modules/bentoml { }; + bespon = callPackage ../development/python-modules/bespon { }; betacode = callPackage ../development/python-modules/betacode { }; @@ -1818,7 +1828,7 @@ self: super: with self; { chai = callPackage ../development/python-modules/chai { }; chainer = callPackage ../development/python-modules/chainer { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; chainmap = callPackage ../development/python-modules/chainmap { }; @@ -2347,10 +2357,10 @@ self: super: with self; { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.0b2"; + version = "3.0.0"; src = old.src.override { inherit version; - hash = "sha256-bEKAZWV56STBGURyR2ZLsi+v7cfezKWTqOogvdV9Z1U="; + hash = "sha256-NQsY+Wc+YxAdu/z3dO4vV8IKxGNtJVdB12ynkBaxvYI="; }; patches = [ ]; }); @@ -2769,13 +2779,13 @@ self: super: with self; { django-ckeditor = callPackage ../development/python-modules/django-ckeditor { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; + django-classy-tags = callPackage ../development/python-modules/django-classy-tags { }; django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; + django-colorful = callPackage ../development/python-modules/django-colorful { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + django-compat = callPackage ../development/python-modules/django-compat { }; django-compressor = callPackage ../development/python-modules/django-compressor { }; @@ -2785,7 +2795,7 @@ self: super: with self; { django-context-decorator = callPackage ../development/python-modules/django-context-decorator { }; - django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django-contrib-comments = callPackage ../development/python-modules/django-contrib-comments { }; django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; @@ -2803,7 +2813,7 @@ self: super: with self; { django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { }; - django-environ = callPackage ../development/python-modules/django_environ { }; + django-environ = callPackage ../development/python-modules/django-environ { }; django-extensions = callPackage ../development/python-modules/django-extensions { }; @@ -2859,7 +2869,7 @@ self: super: with self; { django-model-utils = callPackage ../development/python-modules/django-model-utils { }; - django-modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + django-modelcluster = callPackage ../development/python-modules/django-modelcluster { }; django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; @@ -2869,7 +2879,7 @@ self: super: with self; { django-mysql = callPackage ../development/python-modules/django-mysql { }; - django_nose = callPackage ../development/python-modules/django_nose { }; + django-nose = callPackage ../development/python-modules/django-nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -2941,7 +2951,7 @@ self: super: with self; { django-sesame = callPackage ../development/python-modules/django-sesame { }; - django_silk = callPackage ../development/python-modules/django_silk { }; + django-silk = callPackage ../development/python-modules/django-silk { }; django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; @@ -2959,7 +2969,7 @@ self: super: with self; { django-tables2 = callPackage ../development/python-modules/django-tables2 { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; + django-tagging = callPackage ../development/python-modules/django-tagging { }; django-taggit = callPackage ../development/python-modules/django-taggit { }; @@ -2967,7 +2977,7 @@ self: super: with self; { django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; - django_treebeard = callPackage ../development/python-modules/django_treebeard { }; + django-treebeard = callPackage ../development/python-modules/django-treebeard { }; django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { }; @@ -3075,6 +3085,8 @@ self: super: with self; { doit-py = callPackage ../development/python-modules/doit-py { }; + dokuwiki = callPackage ../development/python-modules/dokuwiki { }; + domeneshop = callPackage ../development/python-modules/domeneshop { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -3918,6 +3930,8 @@ self: super: with self; { folium = callPackage ../development/python-modules/folium { }; + fontawesomefree = callPackage ../development/python-modules/fontawesomefree { }; + fontforge = toPythonModule (pkgs.fontforge.override { withPython = true; inherit python; @@ -4714,6 +4728,8 @@ self: super: with self; { hexdump = callPackage ../development/python-modules/hexdump { }; + hfst = callPackage ../development/python-modules/hfst { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; hg-evolve = callPackage ../development/python-modules/hg-evolve { }; @@ -4817,6 +4833,8 @@ self: super: with self; { html5lib = callPackage ../development/python-modules/html5lib { }; + html5tagger = callPackage ../development/python-modules/html5tagger { }; + html5-parser = callPackage ../development/python-modules/html5-parser { }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -5286,13 +5304,13 @@ self: super: with self; { jax-jumpy = callPackage ../development/python-modules/jax-jumpy { }; jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; jaxlib-build = callPackage ../development/python-modules/jaxlib rec { inherit (pkgs.darwin) cctools; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; @@ -5445,6 +5463,8 @@ self: super: with self; { jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; + jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; json-tricks = callPackage ../development/python-modules/json-tricks { }; @@ -5837,7 +5857,7 @@ self: super: with self; { libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { inherit (self) boost; }; - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; @@ -6163,6 +6183,8 @@ self: super: with self; { mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; + macaddress = callPackage ../development/python-modules/macaddress{ }; + macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; @@ -6175,6 +6197,8 @@ self: super: with self; { magicgui = callPackage ../development/python-modules/magicgui { }; + magic-filter = callPackage ../development/python-modules/magic-filter { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; @@ -6522,6 +6546,7 @@ self: super: with self; { mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; + mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; @@ -6978,13 +7003,6 @@ self: super: with self; { withPython = true; }); - nghttp2 = (toPythonModule (pkgs.nghttp2.override { - python3Packages = self; - inherit (pkgs) ncurses; - enableApp = false; # build only libnghttp2 ... - enablePython = true; # ... and its Python bindings - })).python; - nh3 = callPackage ../development/python-modules/nh3 { }; niaaml = callPackage ../development/python-modules/niaaml { }; @@ -7150,7 +7168,7 @@ self: super: with self; { num2words = callPackage ../development/python-modules/num2words { }; numba = callPackage ../development/python-modules/numba { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; numbaWithCuda = self.numba.override { @@ -7276,6 +7294,8 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omorfi = callPackage ../development/python-modules/omorfi { }; + omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; ondilo = callPackage ../development/python-modules/ondilo { }; @@ -7294,6 +7314,8 @@ self: super: with self; { onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; + onnxmltools = callPackage ../development/python-modules/onnxmltools { }; + onnxruntime = callPackage ../development/python-modules/onnxruntime { onnxruntime = pkgs.onnxruntime.override { python3Packages = self; @@ -7318,7 +7340,7 @@ self: super: with self; { openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { }; openai-whisper = callPackage ../development/python-modules/openai-whisper { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; openant = callPackage ../development/python-modules/openant { }; @@ -7404,10 +7426,14 @@ self: super: with self; { opentelemetry-instrumentation = callPackage ../development/python-modules/opentelemetry-instrumentation { }; + opentelemetry-instrumentation-aiohttp-client = callPackage ../development/python-modules/opentelemetry-instrumentation-aiohttp-client { }; + opentelemetry-instrumentation-asgi = callPackage ../development/python-modules/opentelemetry-instrumentation-asgi { }; opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { }; + opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; + opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { }; opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { }; @@ -7559,7 +7585,9 @@ self: super: with self; { panasonic-viera = callPackage ../development/python-modules/panasonic-viera { }; - pandas = callPackage ../development/python-modules/pandas { }; + pandas = callPackage ../development/python-modules/pandas { + inherit (pkgs.darwin) adv_cmds; + }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -10900,6 +10928,8 @@ self: super: with self; { reproject = callPackage ../development/python-modules/reproject { }; + reprshed = callPackage ../development/python-modules/reprshed { }; + reqif = callPackage ../development/python-modules/reqif { }; requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; @@ -12361,12 +12391,12 @@ self: super: with self; { tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; tensorflow-build = callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; inherit (self.tensorflow-bin) cudaPackages; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; @@ -12485,7 +12515,7 @@ self: super: with self; { theano-pymc = callPackage ../development/python-modules/theano-pymc { }; theano = callPackage ../development/python-modules/theano rec { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; cudnnSupport = cudaSupport; }; @@ -12652,9 +12682,9 @@ self: super: with self; { toposort = callPackage ../development/python-modules/toposort { }; torch = callPackage ../development/python-modules/torch { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; magma = - if pkgs.config.cudaSupport or false + if pkgs.config.cudaSupport then pkgs.magma-cuda-static else pkgs.magma; inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices; @@ -12740,6 +12770,8 @@ self: super: with self; { traceback2 = callPackage ../development/python-modules/traceback2 { }; + tracerite = callPackage ../development/python-modules/tracerite { }; + tracing = callPackage ../development/python-modules/tracing { }; trackpy = callPackage ../development/python-modules/trackpy { }; @@ -13100,6 +13132,10 @@ self: super: with self; { unrpa = callPackage ../development/python-modules/unrpa { }; + unstructured = callPackage ../development/python-modules/unstructured { }; + + unstructured-api-tools = callPackage ../development/python-modules/unstructured-api-tools { }; + unstructured-inference = callPackage ../development/python-modules/unstructured-inference { }; untangle = callPackage ../development/python-modules/untangle { }; @@ -13878,8 +13914,6 @@ self: super: with self; { zodbpickle = callPackage ../development/python-modules/zodbpickle { }; - zope_broken = callPackage ../development/python-modules/zope_broken { }; - zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { }; zope_component = callPackage ../development/python-modules/zope_component { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index b3fd53eae20..4fda684b54d 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -33,6 +33,8 @@ in qt6ct = callPackage ../tools/misc/qt6ct { }; + qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { }; + qtkeychain = callPackage ../development/libraries/qtkeychain { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; |