diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md index c197f03402..258c85f9dd 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md +++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,6 +26,7 @@ If applicable, add screenshots to help explain your problem. Add any other context about the problem here. ### Notify maintainers + ### Metadata + Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. ```console diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/missing_documentation.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/missing_documentation.md index c00dc91bae..3018b6b994 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -1,7 +1,7 @@ --- name: Missing or incorrect documentation about: Help us improve the Nixpkgs and NixOS reference manuals -title: '' +title: 'Documentation: ' labels: '9.needs: documentation' assignees: '' @@ -11,6 +11,10 @@ assignees: '' +## Proposal + + + ## Checklist @@ -26,7 +30,3 @@ assignees: '' [open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22 [open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22 -## Proposal - - - diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index f1535526c2..2735534b0b 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -1,24 +1,17 @@ --- name: Out-of-date package reports about: For packages that are out-of-date -title: '' +title: 'Update request: PACKAGENAME OLDVERSION → NEWVERSION' labels: '9.needs: package (update)' assignees: '' --- - -###### Checklist - - - - -- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) +- Package name: +- Latest released version: + +- Current version on the unstable channel: +- Current version on the stable/release channel: - [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls) -###### Project name -`nix search` name: - -current version: -desired version: +**Notify maintainers** -###### Notify maintainers - + -maintainers: +----- -###### Note for maintainers - -Please tag this issue in your PR. +Note for maintainers: Please tag this issue in your PR. diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/packaging_request.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/packaging_request.md index 1ddcd983f3..a76741fa8e 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/packaging_request.md +++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/packaging_request.md @@ -1,14 +1,15 @@ --- name: Packaging requests about: For packages that are missing -title: '' +title: 'Package request: PACKAGENAME' labels: '0.kind: packaging request' assignees: '' --- **Project description** -_describe the project a little_ + + **Metadata** diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index 773eb3028d..551df86a58 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -163,3 +163,30 @@ or "hg"), `domain` and `fetchSubmodules`. If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit` or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`, respectively. Otherwise, the fetcher uses `fetchzip`. + +## `requireFile` {#requirefile} + +`requireFile` allows requesting files that cannot be fetched automatically, but whose content is known. +This is a useful last-resort workaround for license restrictions that prohibit redistribution, or for downloads that are only accessible after authenticating interactively in a browser. +If the requested file is present in the Nix store, the resulting derivation will not be built, because its expected output is already available. +Otherwise, the builder will run, but fail with a message explaining to the user how to provide the file. The following code, for example: + +``` +requireFile { + name = "jdk-${version}_linux-x64_bin.tar.gz"; + url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; + sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; +} +``` +results in this error message: +``` +*** +Unfortunately, we cannot download file jdk-11.0.10_linux-x64_bin.tar.gz automatically. +Please go to https://www.oracle.com/java/technologies/javase-jdk11-downloads.html to download it yourself, and add it to the Nix store +using either + nix-store --add-fixed sha256 jdk-11.0.10_linux-x64_bin.tar.gz +or + nix-prefetch-url --type sha256 file:///path/to/jdk-11.0.10_linux-x64_bin.tar.gz + +*** +``` diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index f6a0970165..2530b14a2f 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -204,13 +204,13 @@ The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _s In Nixpkgs, there are generally three different names associated with a package: -- The `name` attribute of the derivation (excluding the version part). This is what most users see, in particular when using `nix-env`. +- The `pname` attribute of the derivation. This is what most users see, in particular when using `nix-env`. - The variable name used for the instantiated package in `all-packages.nix`, and when passing it as a dependency to other functions. Typically this is called the _package attribute name_. This is what Nix expression authors see. It can also be used when installing using `nix-env -iA`. - The filename for (the directory containing) the Nix expression. -Most of the time, these are the same. For instance, the package `e2fsprogs` has a `name` attribute `"e2fsprogs-version"`, is bound to the variable name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`. +Most of the time, these are the same. For instance, the package `e2fsprogs` has a `pname` attribute `"e2fsprogs"`, is bound to the variable name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`. There are a few naming guidelines: diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index 1d5fa4811a..ac405c3790 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -1,6 +1,5 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let - lib = pkgs.lib; doc-support = import ./doc-support { inherit pkgs nixpkgs; }; in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; @@ -15,7 +14,7 @@ in pkgs.stdenv.mkDerivation { xmlformat ]; - src = lib.cleanSource ./.; + src = pkgs.nix-gitignore.gitignoreSource [] ./.; postPatch = '' ln -s ${doc-support} ./doc-support/result diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index f0b302bbc3..f21ba295dc 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -195,7 +195,7 @@ maintenance work for `haskellPackages` is required. Besides that, it is not possible to get the dependencies of a legacy project from nixpkgs or to use a specific stack solver for compiling a project. -Even though we couldn‘t use them directly in nixpkgs, it would be desirable +Even though we couldn’t use them directly in nixpkgs, it would be desirable to have tooling to generate working Nix package sets from build plans generated by `cabal-install` or a specific Stackage snapshot via import-from-derivation. Sadly we currently don’t have tooling for this. For this you might be @@ -538,7 +538,7 @@ via [`shellFor`](#haskell-shellFor). When using `cabal-install` for dependency resolution you need to be a bit careful to achieve build purity. `cabal-install` will find and use all dependencies installed from the packages `env` via Nix, but it will also -consult Hackage to potentially download and compile dependencies if it can‘t +consult Hackage to potentially download and compile dependencies if it can’t find a valid build plan locally. To prevent this you can either never run `cabal update`, remove the cabal database from your `~/.cabal` folder or run `cabal` with `--offline`. Note though, that for some usecases `cabal2nix` needs diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 3774924c0b..f089b99a04 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -38,6 +38,7 @@ + diff --git a/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md index ee0a471be3..eecc84b4c1 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md @@ -4,6 +4,48 @@ Nixpkgs provides a couple of facilities for working with this tool. - - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment. - - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules. - - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. +## Writing packages providing pkg-config modules + +Packages should set `meta.pkgConfigProvides` with the list of package config modules they provide. +They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list. +Additionally, the [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), will do extra checks on to-be-installed pkg-config modules. + +A good example of all these things is zlib: + +``` +{ pkg-config, testers, ... }: + +stdenv.mkDerivation (finalAttrs: { + ... + + nativeBuildInputs = [ pkg-config validatePkgConfig ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + ... + pkgConfigModules = [ "zlib" ]; + }; +}) +``` + +## Accessing packages via pkg-config module name + +### Within Nixpkgs + +A [setup hook](#setup-hook-pkg-config) is bundled in the `pkg-config` package to bring a derivation's declared build inputs into the environment. +This will populate environment variables like `PKG_CONFIG_PATH`, `PKG_CONFIG_PATH_FOR_BUILD`, and `PKG_CONFIG_PATH_HOST` based on: + + - how `pkg-config` itself is depended upon + + - how other dependencies are depended upon + +For more details see the section on [specifying dependencies in general](#ssec-stdenv-dependencies). + +Normal pkg-config commands to look up dependencies by name will then work with those environment variables defined by the hook. + +### Externally + +The `defaultPkgConfigPackages` package set is a set of aliases, named after the modules they provide. +This is meant to be used by language-to-nix integrations. +Hand-written packages should use the normal Nixpkgs attribute name instead. diff --git a/third_party/nixpkgs/doc/languages-frameworks/swift.section.md b/third_party/nixpkgs/doc/languages-frameworks/swift.section.md new file mode 100644 index 0000000000..1cc452cc9b --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/swift.section.md @@ -0,0 +1,176 @@ +# Swift {#swift} + +The Swift compiler is provided by the `swift` package: + +```sh +# Compile and link a simple executable. +nix-shell -p swift --run 'swiftc -' <<< 'print("Hello world!")' +# Run it! +./main +``` + +The `swift` package also provides the `swift` command, with some caveats: + +- Swift Package Manager (SwiftPM) is packaged separately as `swiftpm`. If you + need functionality like `swift build`, `swift run`, `swift test`, you must + also add the `swiftpm` package to your closure. +- On Darwin, the `swift repl` command requires an Xcode installation. This is + because it uses the system LLDB debugserver, which has special entitlements. + +## Module search paths {#ssec-swift-module-search-paths} + +Like other toolchains in Nixpkgs, the Swift compiler executables are wrapped +to help Swift find your application's dependencies in the Nix store. These +wrappers scan the `buildInputs` of your package derivation for specific +directories where Swift modules are placed by convention, and automatically +add those directories to the Swift compiler search paths. + +Swift follows different conventions depending on the platform. The wrappers +look for the following directories: + +- On Darwin platforms: `lib/swift/macosx` + (If not targeting macOS, replace `macosx` with the Xcode platform name.) +- On other platforms: `lib/swift/linux/x86_64` + (Where `linux` and `x86_64` are from lowercase `uname -sm`.) +- For convenience, Nixpkgs also adds simply `lib/swift` to the search path. + This can save a bit of work packaging Swift modules, because many Nix builds + will produce output for just one target any way. + +## Core libraries {#ssec-swift-core-libraries} + +In addition to the standard library, the Swift toolchain contains some +additional 'core libraries' that, on Apple platforms, are normally distributed +as part of the OS or Xcode. These are packaged separately in Nixpkgs, and can +be found (for use in `buildInputs`) as: + +- `swiftPackages.Dispatch` +- `swiftPackages.Foundation` +- `swiftPackages.XCTest` + +## Packaging with SwiftPM {#ssec-swift-packaging-with-swiftpm} + +Nixpkgs includes a small helper `swiftpm2nix` that can fetch your SwiftPM +dependencies for you, when you need to write a Nix expression to package your +application. + +The first step is to run the generator: + +```sh +cd /path/to/my/project +# Enter a Nix shell with the required tools. +nix-shell -p swift swiftpm swiftpm2nix +# First, make sure the workspace is up-to-date. +swift package resolve +# Now generate the Nix code. +swiftpm2nix +``` + +This produces some files in a directory `nix`, which will be part of your Nix +expression. The next step is to write that expression: + +```nix +{ stdenv, swift, swiftpm, swiftpm2nix, fetchFromGitHub }: + +let + # Pass the generated files to the helper. + generated = swiftpm2nix.helpers ./nix; +in + +stdenv.mkDerivation rec { + pname = "myproject"; + version = "0.0.0"; + + src = fetchFromGitHub { + owner = "nixos"; + repo = pname; + rev = version; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + }; + + # Including SwiftPM as a nativeBuildInput provides a buildPhase for you. + # This by default performs a release build using SwiftPM, essentially: + # swift build -c release + nativeBuildInputs = [ swift swiftpm ]; + + # The helper provides a configure snippet that will prepare all dependencies + # in the correct place, where SwiftPM expects them. + configurePhase = generated.configure; + + installPhase = '' + # This is a special function that invokes swiftpm to find the location + # of the binaries it produced. + binPath="$(swiftpmBinPath)" + # Now perform any installation steps. + mkdir -p $out/bin + cp $binPath/myproject $out/bin/ + ''; +} +``` + +### Custom build flags {#ssec-swiftpm-custom-build-flags} + +If you'd like to build a different configuration than `release`: + +```nix +swiftpmBuildConfig = "debug"; +``` + +It is also possible to provide additional flags to `swift build`: + +```nix +swiftpmFlags = [ "--disable-dead-strip" ]; +``` + +The default `buildPhase` already passes `-j` for parallel building. + +If these two customization options are insufficient, simply provide your own +`buildPhase` that invokes `swift build`. + +### Running tests {#ssec-swiftpm-running-tests} + +Including `swiftpm` in your `nativeBuildInputs` also provides a default +`checkPhase`, but it must be enabled with: + +```nix +doCheck = true; +``` + +This essentially runs: `swift test -c release` + +### Patching dependencies {#ssec-swiftpm-patching-dependencies} + +In some cases, it may be necessary to patch a SwiftPM dependency. SwiftPM +dependencies are located in `.build/checkouts`, but the `swiftpm2nix` helper +provides these as symlinks to read-only `/nix/store` paths. In order to patch +them, we need to make them writable. + +A special function `swiftpmMakeMutable` is available to replace the symlink +with a writable copy: + +``` +configurePhase = generated.configure ++ '' + # Replace the dependency symlink with a writable copy. + swiftpmMakeMutable swift-crypto + # Now apply a patch. + patch -p1 -d .build/checkouts/swift-crypto -i ${./some-fix.patch} +''; +``` + +## Considerations for custom build tools {#ssec-swift-considerations-for-custom-build-tools} + +### Linking the standard library {#ssec-swift-linking-the-standard-library} + +The `swift` package has a separate `lib` output containing just the Swift +standard library, to prevent Swift applications needing a dependency on the +full Swift compiler at run-time. Linking with the Nixpkgs Swift toolchain +already ensures binaries correctly reference the `lib` output. + +Sometimes, Swift is used only to compile part of a mixed codebase, and the +link step is manual. Custom build tools often locate the standard library +relative to the `swift` compiler executable, and while the result will work, +when this path ends up in the binary, it will have the Swift compiler as an +unintended dependency. + +In this case, you should investigate how your build process discovers the +standard library, and override the path. The correct path will be something +like: `"${swift.swift.lib}/${swift.swiftModuleSubdir}"` diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index a12d68c093..0d159233a9 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called ### The check phase {#ssec-check-phase} -The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below). +The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the [`doCheck` variable](#var-stdenv-doCheck) is enabled. #### Variables controlling the check phase {#variables-controlling-the-check-phase} @@ -646,7 +646,8 @@ See the [build phase](#var-stdenv-makeFlags) for details. ##### `checkTarget` {#var-stdenv-checkTarget} -The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing. +The `make` target that runs the tests. +If unset, use `check` if it exists, otherwise `test`; if neither is found, do nothing. ##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index b1441c7281..dc4df95754 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -88,7 +88,7 @@ let updateManyAttrsByPath; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count - optional optionals toList range partition zipListsWith zipLists + optional optionals toList range replicate partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take drop sublist last init crossLists unique intersectLists subtractLists mutuallyExclusive groupBy groupBy'; diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index f22d140141..0c4d9d8bc9 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -114,6 +114,16 @@ in mkLicense lset) ({ fullName = "Bitstream Vera Font License"; }; + bitTorrent10 = { + spdxId = "BitTorrent-1.0"; + fullName = " BitTorrent Open Source License v1.0"; + }; + + bitTorrent11 = { + spdxId = "BitTorrent-1.1"; + fullName = " BitTorrent Open Source License v1.1"; + }; + bola11 = { url = "https://blitiri.com.ar/p/bola/"; fullName = "Buena Onda License Agreement 1.1"; @@ -333,6 +343,13 @@ in mkLicense lset) ({ free = false; }; + ecl20 = { + fullName = "Educational Community License, Version 2.0"; + url = "https://opensource.org/licenses/ECL-2.0"; + shortName = "ECL 2.0"; + spdxId = "ECL-2.0"; + }; + efl10 = { spdxId = "EFL-1.0"; fullName = "Eiffel Forum License v1.0"; diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index 9f69485b40..2186cd4a79 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -303,6 +303,18 @@ rec { else genList (n: first + n) (last - first + 1); + /* Return a list with `n` copies of an element. + + Type: replicate :: int -> a -> [a] + + Example: + replicate 3 "a" + => [ "a" "a" "a" ] + replicate 2 true + => [ true true ] + */ + replicate = n: elem: genList (_: elem) n; + /* Splits the elements of a list in two lists, `right` and `wrong`, depending on the evaluation of a predicate. diff --git a/third_party/nixpkgs/lib/path/default.nix b/third_party/nixpkgs/lib/path/default.nix index 96a9244407..075e2fc0d1 100644 --- a/third_party/nixpkgs/lib/path/default.nix +++ b/third_party/nixpkgs/lib/path/default.nix @@ -4,6 +4,7 @@ let inherit (builtins) isString + isPath split match ; @@ -25,6 +26,10 @@ let assertMsg ; + inherit (lib.path.subpath) + isValid + ; + # Return the reason why a subpath is invalid, or `null` if it's valid subpathInvalidReason = value: if ! isString value then @@ -94,6 +99,52 @@ let in /* No rec! Add dependencies on this file at the top. */ { + /* Append a subpath string to a path. + + Like `path + ("/" + string)` but safer, because it errors instead of returning potentially surprising results. + More specifically, it checks that the first argument is a [path value type](https://nixos.org/manual/nix/stable/language/values.html#type-path"), + and that the second argument is a valid subpath string (see `lib.path.subpath.isValid`). + + Type: + append :: Path -> String -> Path + + Example: + append /foo "bar/baz" + => /foo/bar/baz + + # subpaths don't need to be normalised + append /foo "./bar//baz/./" + => /foo/bar/baz + + # can append to root directory + append /. "foo/bar" + => /foo/bar + + # first argument needs to be a path value type + append "/foo" "bar" + => + + # second argument needs to be a valid subpath string + append /foo /bar + => + append /foo "" + => + append /foo "/bar" + => + append /foo "../bar" + => + */ + append = + # The absolute path to append to + path: + # The subpath string to append + subpath: + assert assertMsg (isPath path) '' + lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected''; + assert assertMsg (isValid subpath) '' + lib.path.append: Second argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + path + ("/" + subpath); /* Whether a value is a valid subpath string. @@ -133,7 +184,9 @@ in /* No rec! Add dependencies on this file at the top. */ { subpath.isValid "./foo//bar/" => true */ - subpath.isValid = value: + subpath.isValid = + # The value to check + value: subpathInvalidReason value == null; @@ -150,11 +203,11 @@ in /* No rec! Add dependencies on this file at the top. */ { Laws: - - (Idempotency) Normalising multiple times gives the same result: + - Idempotency - normalising multiple times gives the same result: subpath.normalise (subpath.normalise p) == subpath.normalise p - - (Uniqueness) There's only a single normalisation for the paths that lead to the same file system node: + - Uniqueness - there's only a single normalisation for the paths that lead to the same file system node: subpath.normalise p != subpath.normalise q -> $(realpath ${p}) != $(realpath ${q}) @@ -210,9 +263,12 @@ in /* No rec! Add dependencies on this file at the top. */ { subpath.normalise "/foo" => */ - subpath.normalise = path: - assert assertMsg (subpathInvalidReason path == null) - "lib.path.subpath.normalise: Argument is not a valid subpath string: ${subpathInvalidReason path}"; - joinRelPath (splitRelPath path); + subpath.normalise = + # The subpath string to normalise + subpath: + assert assertMsg (isValid subpath) '' + lib.path.subpath.normalise: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + joinRelPath (splitRelPath subpath); } diff --git a/third_party/nixpkgs/lib/path/tests/unit.nix b/third_party/nixpkgs/lib/path/tests/unit.nix index eccf3b7b1c..a1a45173a9 100644 --- a/third_party/nixpkgs/lib/path/tests/unit.nix +++ b/third_party/nixpkgs/lib/path/tests/unit.nix @@ -3,9 +3,44 @@ { libpath }: let lib = import libpath; - inherit (lib.path) subpath; + inherit (lib.path) append subpath; cases = lib.runTests { + # Test examples from the lib.path.append documentation + testAppendExample1 = { + expr = append /foo "bar/baz"; + expected = /foo/bar/baz; + }; + testAppendExample2 = { + expr = append /foo "./bar//baz/./"; + expected = /foo/bar/baz; + }; + testAppendExample3 = { + expr = append /. "foo/bar"; + expected = /foo/bar; + }; + testAppendExample4 = { + expr = (builtins.tryEval (append "/foo" "bar")).success; + expected = false; + }; + testAppendExample5 = { + expr = (builtins.tryEval (append /foo /bar)).success; + expected = false; + }; + testAppendExample6 = { + expr = (builtins.tryEval (append /foo "")).success; + expected = false; + }; + testAppendExample7 = { + expr = (builtins.tryEval (append /foo "/bar")).success; + expected = false; + }; + testAppendExample8 = { + expr = (builtins.tryEval (append /foo "../bar")).success; + expected = false; + }; + + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; expected = false; @@ -30,6 +65,7 @@ let expr = subpath.isValid "./foo//bar/"; expected = true; }; + # Some extra tests testSubpathIsValidTwoDotsEnd = { expr = subpath.isValid "foo/.."; expected = false; @@ -71,6 +107,7 @@ let expected = true; }; + # Test examples from the lib.path.subpath.normalise documentation testSubpathNormaliseExample1 = { expr = subpath.normalise "foo//bar"; expected = "./foo/bar"; @@ -107,6 +144,7 @@ let expr = (builtins.tryEval (subpath.normalise "/foo")).success; expected = false; }; + # Some extra tests testSubpathNormaliseIsValidDots = { expr = subpath.normalise "./foo/.bar/.../baz...qux"; expected = "./foo/.bar/.../baz...qux"; diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index c14bddb11a..406656dac1 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -479,6 +479,11 @@ runTests { expected = [2 30 40 42]; }; + testReplicate = { + expr = replicate 3 "a"; + expected = ["a" "a" "a"]; + }; + testToIntShouldConvertStringToInt = { expr = toInt "27"; expected = 27; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 94aab69a2c..857679feb5 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -693,6 +693,15 @@ fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; }]; }; + Alper-Celik = { + email = "dev.alpercelik@gmail.com"; + name = "Alper Çelik"; + github = "Alper-Celik"; + githubId = 110625473; + keys = [{ + fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; + }]; + }; almac = { email = "alma.cemerlic@gmail.com"; github = "a1mac"; @@ -2325,6 +2334,12 @@ githubId = 3212452; name = "Cameron Nemo"; }; + camillemndn = { + email = "camillemondon@free.fr"; + github = "camillemndn"; + githubId = 26444818; + name = "Camille M."; + }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; @@ -5105,6 +5120,12 @@ githubId = 36706276; name = "Fufezan Mihai"; }; + fugi = { + email = "me@fugi.dev"; + github = "FugiMuffi"; + githubId = 21362942; + name = "Fugi"; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; @@ -5242,6 +5263,15 @@ githubId = 313929; name = "Gabriel Ebner"; }; + genericnerdyusername = { + name = "GenericNerdyUsername"; + email = "genericnerdyusername@proton.me"; + github = "GenericNerdyUsername"; + githubId = 111183546; + keys = [{ + fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; + }]; + }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; @@ -6050,6 +6080,12 @@ githubId = 1592375; name = "Walter Huf"; }; + hughobrien = { + email = "github@hughobrien.ie"; + github = "hughobrien"; + githubId = 3400690; + name = "Hugh O'Brien"; + }; hugolgst = { email = "hugo.lageneste@pm.me"; github = "hugolgst"; @@ -6626,6 +6662,12 @@ github = "jayeshbhoot"; githubId = 1915507; }; + jayman2000 = { + email = "jason@jasonyundt.email"; + github = "Jayman2000"; + githubId = 5579359; + name = "Jason Yundt"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; @@ -7003,6 +7045,12 @@ githubId = 2308444; name = "Joshua Gilman"; }; + jnsgruk = { + email = "jon@sgrs.uk"; + github = "jnsgruk"; + githubId = 668505; + name = "Jon Seager"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; @@ -8906,8 +8954,8 @@ githubId = 2914269; name = "Malo Bourgon"; }; - malvo = { - email = "malte@malvo.org"; + malte-v = { + email = "nixpkgs@mal.tc"; github = "malte-v"; githubId = 34393802; name = "Malte Voos"; @@ -9975,6 +10023,12 @@ githubId = 3073833; name = "Massimo Redaelli"; }; + mrityunjaygr8 = { + email = "mrityunjaysaxena1996@gmail.com"; + github = "mrityunjaygr8"; + name = "Mrityunjay Saxena"; + githubId = 14573967; + }; mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; @@ -12874,6 +12928,12 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samhug = { + email = "s@m-h.ug"; + github = "samhug"; + githubId = 171470; + name = "Sam Hug"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -13092,7 +13152,7 @@ github = "Scrumplex"; githubId = 11587657; keys = [{ - fingerprint = "AF1F B107 E188 CB97 9A94 FD7F C104 1129 4912 A422"; + fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; }]; }; scubed2 = { @@ -13210,6 +13270,12 @@ githubId = 38824235; name = "Serge Belov"; }; + serge_sans_paille = { + email = "serge.guelton@telecom-bretagne.eu"; + github = "serge-sans-paille"; + githubId = 863807; + name = "Serge Guelton"; + }; sersorrel = { email = "ash@sorrel.sh"; github = "sersorrel"; @@ -13302,6 +13368,12 @@ githubId = 16765155; name = "Shardul Baral"; }; + sharzy = { + email = "me@sharzy.in"; + github = "SharzyL"; + githubId = 46294732; + name = "Sharzy"; + }; shawndellysse = { email = "sdellysse@gmail.com"; github = "sdellysse"; @@ -13627,6 +13699,12 @@ githubId = 57048005; name = "snicket2100"; }; + sno2wman = { + name = "SnO2WMaN"; + email = "me@sno2wman.net"; + github = "sno2wman"; + githubId = 15155608; + }; snpschaaf = { email = "philipe.schaaf@secunet.com"; name = "Philippe Schaaf"; @@ -13840,6 +13918,12 @@ githubId = 1699155; name = "Steve Elliott"; }; + stefanfehrenbach = { + email = "stefan.fehrenbach@gmail.com"; + github = "fehrenbach"; + githubId = 203168; + name = "Stefan Fehrenbach"; + }; stehessel = { email = "stephan@stehessel.de"; github = "stehessel"; @@ -15240,6 +15324,12 @@ githubId = 27813; name = "Vincent Breitmoser"; }; + vamega = { + email = "github@madiathv.com"; + github = "vamega"; + githubId = 223408; + name = "Varun Madiath"; + }; vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md index c331e63cfe..60771b36fa 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md @@ -54,4 +54,4 @@ run this command to do the same thing. $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true ``` -A log-out and re-log will be needed for this to take effect. +It is necessary to log out and log in again for this to take effect. diff --git a/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix index 913058746b..9dab1738ab 100644 --- a/third_party/nixpkgs/nixos/doc/manual/default.nix +++ b/third_party/nixpkgs/nixos/doc/manual/default.nix @@ -21,6 +21,8 @@ let withManOptDedupPatch = true; }; + manpageUrls = pkgs.path + "/doc/manpage-urls.json"; + # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, # or else the build will fail. @@ -48,7 +50,7 @@ let }; in buildPackages.nixosOptionsDoc { inherit (eval) options; - inherit (revision); + inherit revision; transformOptions = opt: opt // { # Clean up declaration sites to not refer to the NixOS source tree. declarations = @@ -72,7 +74,7 @@ let nativeBuildInputs = [ pkgs.nixos-render-docs ]; } '' nixos-render-docs manual docbook \ - --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + --manpage-urls ${manpageUrls} \ "$out" \ --section \ --section-id modules \ @@ -254,20 +256,38 @@ in rec { # Generate the NixOS manpages. manpages = runCommand "nixos-manpages" { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + nativeBuildInputs = [ + buildPackages.installShellFiles + ] ++ lib.optionals allowDocBook [ + buildPackages.libxml2.bin + buildPackages.libxslt.bin + ] ++ lib.optionals (! allowDocBook) [ + buildPackages.nixos-render-docs + ]; allowedReferences = ["out"]; } '' # Generate manpages. - mkdir -p $out/share/man - xsltproc --nonet \ - --maxdepth 6000 \ - --param man.output.in.separate.dir 1 \ - --param man.output.base.dir "'$out/share/man/'" \ - --param man.endnotes.are.numbered 0 \ - --param man.break.after.slash 1 \ - ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ - ${manual-combined}/man-pages-combined.xml + mkdir -p $out/share/man/man8 + installManPage ${./manpages}/* + ${if allowDocBook + then '' + xsltproc --nonet \ + --maxdepth 6000 \ + --param man.output.in.separate.dir 1 \ + --param man.output.base.dir "'$out/share/man/'" \ + --param man.endnotes.are.numbered 0 \ + --param man.break.after.slash 1 \ + ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ + ${manual-combined}/man-pages-combined.xml + '' + else '' + mkdir -p $out/share/man/man5 + nixos-render-docs options manpage \ + --revision ${lib.escapeShellArg revision} \ + ${optionsJSON}/share/doc/nixos/options.json \ + $out/share/man/man5/configuration.nix.5 + ''} ''; } diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml index 7ec69b5e9b..22a5d9875f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -63,7 +63,8 @@ Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with db $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true - A log-out and re-log will be needed for this to take effect. + It is necessary to log out and log in again for this to take + effect. diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index b8affabb86..6936fdd260 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -116,8 +116,8 @@ QDMR, a - gui application and command line tool for programming cheap - DMR radios + GUI application and command line tool for programming DMR + radios programs.qdmr @@ -152,6 +152,15 @@ are met, or not met. + + + sharing, + a command-line tool to share directories and files from the + CLI to iOS and Android devices without the need of an extra + client app. Available as + programs.sharing. + +
@@ -189,7 +198,22 @@ doInstallCheck is set. (Note that this change will not cause breakage to derivations with strictDeps unset, which are most packages - except python, rust and go packages). + except python, rust, ocaml and go packages). + + + + + buildDunePackage now defaults to + strictDeps = true which means that any + library should go into buildInputs or + checkInputs. Any executable that is run on + the building machine should go into + nativeBuildInputs or + nativeCheckInputs respectively. Example of + executables are ocaml, + findlib and menhir. PPXs + are libraries which are built by dune and should therefore not + go into nativeBuildInputs. @@ -397,6 +421,16 @@ attribute name. + + + Nebula now runs as a system user and group created for each + nebula network, using the CAP_NET_ADMIN + ambient capability on launch rather than starting as root. + Ensure that any files each Nebula instance needs to access are + owned by the correct user and group, by default + nebula-${networkName}. + + In mastodon it is now necessary to specify @@ -488,19 +522,72 @@ A few openssh options have been moved from extraConfig to the new freeform option settings and renamed as - follow: - services.openssh.kbdInteractiveAuthentication - to - services.openssh.settings.KbdInteractiveAuthentication, - services.openssh.passwordAuthentication to - services.openssh.settings.PasswordAuthentication, - services.openssh.useDns to - services.openssh.settings.UseDns, - services.openssh.permitRootLogin to - services.openssh.settings.PermitRootLogin, - services.openssh.logLevel to - services.openssh.settings.LogLevel. + follows: + + + + services.openssh.forwardX11 to + services.openssh.settings.X11Forwarding + + + + + services.openssh.kbdInteractiveAuthentication + -> + services.openssh.settings.KbdInteractiveAuthentication + + + + + services.openssh.passwordAuthentication + to + services.openssh.settings.PasswordAuthentication + + + + + services.openssh.useDns to + services.openssh.settings.UseDns + + + + + services.openssh.permitRootLogin to + services.openssh.settings.PermitRootLogin + + + + + services.openssh.logLevel to + services.openssh.settings.LogLevel + + + + + services.openssh.kexAlgorithms to + services.openssh.settings.KexAlgorithms + + + + + services.openssh.macs to + services.openssh.settings.Macs + + + + + services.openssh.ciphers to + services.openssh.settings.Ciphers + + + + + services.openssh.gatewayPorts to + services.openssh.settings.GatewayPorts + + + @@ -675,6 +762,13 @@ conversion. + + + Grafana Tempo has been updated to version 2.0. See the + upstream + upgrade guide for migration instructions. + + A new virtualisation.rosetta module was @@ -772,6 +866,18 @@ system.stateVersion. + + + Nebula now supports the + services.nebula.networks.<name>.isRelay + and + services.nebula.networks.<name>.relays + configuration options for setting up or allowing traffic + relaying. See the + announcement + for more details about relays. + + hip has been separated into @@ -808,6 +914,60 @@ (services.fwupd.daemonSettings). + + + The zramSwap is now implemented with + zram-generator, and the option + zramSwap.numDevices for using ZRAM devices + as general purpose ephemeral block devices has been removed. + + + + + As Singularity has renamed to + Apptainer + to distinguish from + an + un-renamed fork by Sylabs Inc., there are now two + packages of Singularity/Apptainer: + + + + + apptainer: From + github.com/apptainer/apptainer, which + is the new repo after renaming. + + + + + singularity: From + github.com/sylabs/singularity, which is + the fork by Sylabs Inc.. + + + + + programs.singularity got a new + package option to specify which package to + use. + + + singularity-tools.buildImage got a new + input argument singularity to specify which + package to use. + + + + + The new option + programs.singularity.enableFakeroot, if set + to true, provides + --fakeroot support for + apptainer and + singularity. + + The unifi-poller package and corresponding @@ -836,6 +996,12 @@ libax25 package. + + + tvbrowser-bin was removed, and now + tvbrowser is built from source. + + nixos-version now accepts @@ -850,6 +1016,13 @@ been fixed to allow more than one plugin in the path. + + + The option + services.prometheus.exporters.pihole.interval + does not exist anymore and has been removed. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml deleted file mode 100644 index fa7c8c0c6d..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - nixos-build-vms - 8 - NixOS - - - - nixos-build-vms - build a network of virtual machines from a network of NixOS configurations - - - - nixos-build-vms - - - - - - - - - - - - - - - name - value - - - - network.nix - - - - - Description - - This command builds a network of QEMU-KVM virtual machines of a Nix - expression specifying a network of NixOS machines. The virtual network can - be started by executing the bin/run-vms shell script - that is generated by this command. By default, a result - symlink is produced that points to the generated virtual network. - - - A network Nix expression has the following structure: - -{ - test1 = {pkgs, config, ...}: - { - services.openssh.enable = true; - nixpkgs.localSystem.system = "i686-linux"; - deployment.targetHost = "test1.example.net"; - - # Other NixOS options - }; - - test2 = {pkgs, config, ...}: - { - services.openssh.enable = true; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.localSystem.system = "x86_64-linux"; - deployment.targetHost = "test2.example.net"; - - # Other NixOS options - }; -} - - Each attribute in the expression represents a machine in the network (e.g. - test1 and test2) referring to a - function defining a NixOS configuration. In each NixOS configuration, two - attributes have a special meaning. The - deployment.targetHost specifies the address (domain name - or IP address) of the system which is used by ssh to - perform remote deployment operations. The - nixpkgs.localSystem.system attribute can be used to - specify an architecture for the target machine, such as - i686-linux which builds a 32-bit NixOS configuration. - Omitting this property will build the configuration for the same - architecture as the host system. - - - - Options - - This command accepts the following options: - - - - - - - - - Shows a trace of the output. - - - - - - - - - - Do not create a 'result' symlink. - - - - - - , - - - - Shows the usage of this command to the user. - - - - - - name value - - - Set the Nix configuration option - name to value. - This overrides settings in the Nix configuration file (see - nix.conf5). - - - - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml deleted file mode 100644 index 41f0e6b975..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - nixos-enter - 8 - NixOS - - - - nixos-enter - run a command in a NixOS chroot environment - - - - nixos-enter - - - - - root - - - - - - - system - - - - - - - shell-command - - - - - - - - - - - - - - - - - - - arguments - - - - - Description - - This command runs a command in a NixOS chroot environment, that is, in a - filesystem hierarchy previously prepared using - nixos-install. - - - - Options - - This command accepts the following options: - - - - - - - - - The path to the NixOS system you want to enter. It defaults to - /mnt. - - - - - - - - - - The NixOS system configuration to use. It defaults to - /nix/var/nix/profiles/system. You can enter a - previous NixOS configuration by specifying a path such as - /nix/var/nix/profiles/system-106-link. - - - - - - - - - - - - - The bash command to execute. - - - - - - - - - - Suppresses all output from the activation script of the target system. - - - - - - - - - - Interpret the remaining arguments as the program name and arguments to be - invoked. The program is not executed in a shell. - - - - - - - Examples - - Start an interactive shell in the NixOS installation in - /mnt: - - -# nixos-enter --root /mnt - - - Run a shell command: - - -# nixos-enter -c 'ls -l /; cat /proc/mounts' - - - Run a non-shell command: - - -# nixos-enter -- cat /proc/mounts - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-generate-config.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-generate-config.xml deleted file mode 100644 index 9ac3b918ff..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-generate-config.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - nixos-generate-config - 8 - NixOS - - - - nixos-generate-config - generate NixOS configuration modules - - - - nixos-generate-config - - - - - - - - - root - - - - - - - dir - - - - - Description - - This command writes two NixOS configuration modules: - - - - - - - - This module sets NixOS configuration options based on your current - hardware configuration. In particular, it sets the - option to reflect all currently mounted file - systems, the option to reflect active swap - devices, and the options to ensure that - the initial ramdisk contains any kernel modules necessary for mounting - the root file system. - - - If this file already exists, it is overwritten. Thus, you should not - modify it manually. Rather, you should include it from your - /etc/nixos/configuration.nix, and re-run - nixos-generate-config to update it whenever your - hardware configuration changes. - - - - - - - - - - This is the main NixOS system configuration module. If it already - exists, it’s left unchanged. Otherwise, - nixos-generate-config will write a template for you - to customise. - - - - - - - - Options - - This command accepts the following options: - - - - - - - - - If this option is given, treat the directory - root as the root of the file system. This - means that configuration files will be written to - root/etc/nixos, and that - any file systems outside of root are ignored - for the purpose of generating the option. - - - - - - - - - - If this option is given, write the configuration files to the directory - dir instead of - /etc/nixos. - - - - - - - - - - Overwrite /etc/nixos/configuration.nix if it already - exists. - - - - - - - - - - Omit everything concerning file systems and swap devices from the - hardware configuration. - - - - - - - - - - Don't generate configuration.nix or - hardware-configuration.nix and print the hardware - configuration to stdout only. - - - - - - - Examples - - This command is typically used during NixOS installation to write initial - configuration modules. For example, if you created and mounted the target - file systems on /mnt and - /mnt/boot, you would run: - -$ nixos-generate-config --root /mnt - - The resulting file - /mnt/etc/nixos/hardware-configuration.nix might look - like this: - -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, pkgs, ... }: - -{ - imports = - [ <nixos/modules/installer/scan/not-detected.nix> - ]; - - boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-label/nixos"; - fsType = "ext3"; - options = [ "rw" "data=ordered" "relatime" ]; - }; - - fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext3"; - options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ]; - }; - - swapDevices = - [ { device = "/dev/sda2"; } - ]; - - nix.maxJobs = 8; -} - - It will also create a basic - /mnt/etc/nixos/configuration.nix, which you should edit - to customise the logical configuration of your system. This file includes - the result of the hardware scan as follows: - - imports = [ ./hardware-configuration.nix ]; - - - - After installation, if your hardware configuration changes, you can run: - -$ nixos-generate-config - - to update /etc/nixos/hardware-configuration.nix. Your - /etc/nixos/configuration.nix will - not be overwritten. - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml deleted file mode 100644 index eb6680b656..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml +++ /dev/null @@ -1,357 +0,0 @@ - - - nixos-install - 8 - NixOS - - - - nixos-install - install bootloader and NixOS - - - - nixos-install - - - - - - - - - - - - - - - path - - - - - - - root - - - - - - - path - - - - flake-uri - - - - - - - - - - - - - channel - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - number - - - - number - - - - name value - - - - - - - - - - - - - - - - - - - - - - - Description - - This command installs NixOS in the file system mounted on - /mnt, based on the NixOS configuration specified in - /mnt/etc/nixos/configuration.nix. It performs the - following steps: - - - - It copies Nix and its dependencies to - /mnt/nix/store. - - - - - It runs Nix in /mnt to build the NixOS configuration - specified in /mnt/etc/nixos/configuration.nix. - - - - - It installs the current channel nixos in the target channel - profile (unless is specified). - - - - - It installs the GRUB boot loader on the device specified in the option - (unless - is specified), and generates a GRUB - configuration file that boots into the NixOS configuration just - installed. - - - - - It prompts you for a password for the root account (unless - is specified). - - - - - - This command is idempotent: if it is interrupted or fails due to a temporary - problem (e.g. a network issue), you can safely re-run it. - - - - Options - - This command accepts the following options: - - - - / - - Increases the level of verbosity of diagnostic messages - printed on standard error. For each Nix operation, the information - printed on standard output is well-defined; any diagnostic - information is printed on standard error, never on standard - output. - Please note that this option may be specified repeatedly. - - - - - - - - - Defaults to /mnt. If this option is given, treat the - directory root as the root of the NixOS - installation. - - - - - - - - - - If this option is provided, nixos-install will install - the specified closure rather than attempt to build one from - /mnt/etc/nixos/configuration.nix. - - - The closure must be an appropriately configured NixOS system, with boot - loader and partition configuration that fits the target host. Such a - closure is typically obtained with a command such as nix-build - -I nixos-config=./configuration.nix '<nixpkgs/nixos>' -A system - --no-out-link - - - - - - flake-uri#name - - - - Build the NixOS system from the specified flake. - The flake must contain an output named - nixosConfigurations.name. - - - - - - - - - - If this option is provided, do not copy the current - nixos channel to the target host. Instead, use the - specified derivation. - - - - - - - - - - Add a path to the Nix expression search path. This option may be given - multiple times. See the NIX_PATH environment variable for information on - the semantics of the Nix search path. Paths added through - -I take precedence over NIX_PATH. - - - - - - - - - - - - - Sets the maximum number of build jobs that Nix will perform in parallel - to the specified number. The default is 1. A higher - value is useful on SMP systems or to exploit I/O latency. - - - - - - - - - - Sets the value of the NIX_BUILD_CORES environment variable - in the invocation of builders. Builders can use this variable at their - discretion to control the maximum amount of parallelism. For instance, in - Nixpkgs, if the derivation attribute - enableParallelBuilding is set to - true, the builder passes the - flag to GNU Make. The - value 0 means that the builder should use all - available CPU cores in the system. - - - - - - name value - - - - Set the Nix configuration option name to - value. - - - - - - - - - - Causes Nix to print out a stack trace in case of Nix expression - evaluation errors. - - - - - - - - - - Causes Nix to continue building derivations as far as possible - in the face of failed builds. - - - - - - - - - - Synonym for man nixos-install. - - - - - - - Examples - - A typical NixOS installation is done by creating and mounting a file system - on /mnt, generating a NixOS configuration in - /mnt/etc/nixos/configuration.nix, and running - nixos-install. For instance, if we want to install NixOS - on an ext4 file system created in - /dev/sda1: - -$ mkfs.ext4 /dev/sda1 -$ mount /dev/sda1 /mnt -$ nixos-generate-config --root /mnt -$ # edit /mnt/etc/nixos/configuration.nix -$ nixos-install -$ reboot - - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-option.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-option.xml deleted file mode 100644 index b921386d0d..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-option.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - nixos-option - 8 - NixOS - - - - nixos-option - inspect a NixOS configuration - - - - nixos-option - - - - - - - - - - path - - - - option.name - - - - - Description - - This command evaluates the configuration specified in - /etc/nixos/configuration.nix and returns the properties - of the option name given as argument. - - - When the option name is not an option, the command prints the list of - attributes contained in the attribute set. - - - - Options - - This command accepts the following options: - - - - - - - - Print all the values at or below the specified path recursively. - - - - - - path - - - - This option is passed to the underlying - nix-instantiate invocation. - - - - - - - Environment - - - - NIXOS_CONFIG - - - - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. - - - - - - - Examples - - Investigate option values: -$ nixos-option boot.loader -This attribute set contains: -generationsDir -grub -initScript - -$ nixos-option boot.loader.grub.enable -Value: -true - -Default: -true - -Description: -Whether to enable the GNU GRUB boot loader. - -Declared by: - "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - -Defined by: - "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - - - - - Bugs - - The author listed in the following section is wrong. If there is any other - bug, please report to Nicolas Pierron. - - - - See also - - - configuration.nix - 5 - - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml deleted file mode 100644 index bf0f4aafa1..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ /dev/null @@ -1,781 +0,0 @@ - - - nixos-rebuild - 8 - NixOS - - - - - nixos-rebuild - reconfigure a NixOS machine - - - - - nixos-rebuild - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - builder-spec - - - - - - flake-uri - - - - - - - - input-name flake-uri - - - - - - - - - - - - - - name - - - - - - - - - - - - name - - - - - - host - - - - host - - - - - - - - - - - - - - NIX_PATH - - - - - - - - - - - - - - - - - - number - - - - - - - - - - - - - - - - - - Description - - - This command updates the system so that it corresponds to the - configuration specified in - /etc/nixos/configuration.nix or - /etc/nixos/flake.nix. Thus, every time you - modify the configuration or any other NixOS module, you must run - nixos-rebuild to make the changes take - effect. It builds the new system in - /nix/store, runs its activation script, and - stop and (re)starts any system services if needed. Please note that - user services need to be started manually as they aren't detected - by the activation script at the moment. - - - - This command has one required argument, which specifies the desired - operation. It must be one of the following: - - - - - - - - - Build and activate the new configuration, and make it the boot default. - That is, the configuration is added to the GRUB boot menu as the default - menu entry, so that subsequent reboots will boot the system into the new - configuration. Previous configurations activated with - nixos-rebuild switch or nixos-rebuild - boot remain available in the GRUB menu. - - - Note that if you are using specializations, running just - nixos-rebuild switch will switch you back to the - unspecialized, base system - in that case, you might want to use this - instead: - -$ nixos-rebuild switch --specialisation your-specialisation-name - - This command will build all specialisations and make them bootable just - like regular nixos-rebuild switch does - the only - thing different is that it will switch to given specialisation instead - of the base system; it can be also used to switch from the base system - into a specialised one, or to switch between specialisations. - - - - - - - - - - - Build the new configuration and make it the boot default (as with - nixos-rebuild switch), but do not activate it. That - is, the system continues to run the previous configuration until the - next reboot. - - - - - - - - - - - Build and activate the new configuration, but do not add it to the GRUB - boot menu. Thus, if you reboot the system (or if it crashes), you will - automatically revert to the default configuration (i.e. the - configuration resulting from the last call to nixos-rebuild - switch or nixos-rebuild boot). - - - Note that if you are using specialisations, running just - nixos-rebuild test will activate the unspecialised, - base system - in that case, you might want to use this instead: - -$ nixos-rebuild test --specialisation your-specialisation-name - - This command can be also used to switch from the base system into a - specialised one, or to switch between specialisations. - - - - - - - - - - - Build the new configuration, but neither activate it nor add it to the - GRUB boot menu. It leaves a symlink named result in - the current directory, which points to the output of the top-level - “system” derivation. This is essentially the same as doing - -$ nix-build /path/to/nixpkgs/nixos -A system - - Note that you do not need to be root to run - nixos-rebuild build. - - - - - - - - - - - Show what store paths would be built or downloaded by any of the - operations above, but otherwise do nothing. - - - - - - - - - - - Build the new configuration, but instead of activating it, show what - changes would be performed by the activation (i.e. by - nixos-rebuild test). For instance, this command will - print which systemd units would be restarted. The list of changes is not - guaranteed to be complete. - - - - - - - - - - - Opens configuration.nix in the default editor. - - - - - - - - - - - Build a script that starts a NixOS virtual machine with the desired - configuration. It leaves a symlink result in the - current directory that points (under - result/bin/run-hostname-vm) - at the script that starts the VM. Thus, to test a NixOS configuration in - a virtual machine, you should do the following: - -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm - - - - - The VM is implemented using the qemu package. For - best performance, you should load the kvm-intel or - kvm-amd kernel modules to get hardware - virtualisation. - - - - The VM mounts the Nix store of the host through the 9P file system. The - host Nix store is read-only, so Nix commands that modify the Nix store - will not work in the VM. This includes commands such as - nixos-rebuild; to change the VM’s configuration, - you must halt the VM and re-run the commands above. - - - - The VM has its own ext3 root file system, which is - automatically created when the VM is first started, and is persistent - across reboots of the VM. It is stored in - ./hostname.qcow2. - - - - - - - - - - - - Like , but boots using the regular boot loader - of your configuration (e.g., GRUB 1 or 2), rather than booting directly - into the kernel and initial ramdisk of the system. This allows you to - test whether the boot loader works correctly. However, it does not - guarantee that your NixOS configuration will boot successfully on the - host hardware (i.e., after running nixos-rebuild - switch), because the hardware and boot loader configuration in - the VM are different. The boot loader is installed on an automatically - generated virtual disk containing a /boot - partition. - - - - - - - - - Options - - This command accepts the following options: - - - - - - - - - - - - - Update the root user's channel named nixos - before rebuilding the system. - - - In addition to the nixos channel, the root - user's channels which have a file named - .update-on-nixos-rebuild in their base - directory will also be updated. - - - Passing updates all of the root - user's channels. - - - - - - - - - - - Causes the boot loader to be (re)installed on the device specified by the - relevant configuration options. - - - - - - - - - - - Normally, nixos-rebuild first builds the - nixUnstable attribute in Nixpkgs, and uses the - resulting instance of the Nix package manager to build the new system - configuration. This is necessary if the NixOS modules use features not - provided by the currently installed version of Nix. This option disables - building a new Nix. - - - - - - - - - - - Equivalent to . This option is - useful if you call nixos-rebuild frequently - (e.g. if you’re hacking on a NixOS module). - - - - - - - - - - - Instead of building a new configuration as specified by - /etc/nixos/configuration.nix, roll back to the - previous configuration. (The previous configuration is defined as the one - before the “current” generation of the Nix profile - /nix/var/nix/profiles/system.) - - - - - - - builder-spec - - - - Allow ad-hoc remote builders for building the new system. This requires - the user executing nixos-rebuild (usually root) to be - configured as a trusted user in the Nix daemon. This can be achieved by - using the nix.settings.trusted-users NixOS option. Examples - values for that option are described in the Remote builds - chapter in the Nix manual, (i.e. --builders - "ssh://bigbrother x86_64-linux"). By specifying an empty string - existing builders specified in /etc/nix/machines can - be ignored: --builders "" for example when they are - not reachable due to network connectivity. - - - - - - - - - - - - - - Instead of using the Nix profile - /nix/var/nix/profiles/system to keep track of the - current and previous system configurations, use - /nix/var/nix/profiles/system-profiles/name. - When you use GRUB 2, for every system profile created with this flag, - NixOS will create a submenu named “NixOS - Profile - 'name'” in GRUB’s boot menu, containing - the current and previous configurations of this profile. - - - For instance, if you want to test a configuration file named - test.nix without affecting the default system - profile, you would do: - -$ nixos-rebuild switch -p test -I nixos-config=./test.nix - - The new configuration will appear in the GRUB 2 submenu “NixOS - - Profile 'test'”. - - - - - - - - - - - - - - Activates given specialisation; when not specified, switching and testing - will activate the base, unspecialised system. - - - - - - - - - - - Instead of building the new configuration locally, use the specified host - to perform the build. The host needs to be accessible with ssh, and must - be able to perform Nix builds. If the option - is not set, the build will be copied back - to the local machine when done. - - - Note that, if is not specified, Nix will - be built both locally and remotely. This is because the configuration - will always be evaluated locally even though the building might be - performed remotely. - - - You can include a remote user name in the host name - (user@host). You can also set ssh options by - defining the NIX_SSHOPTS environment variable. - - - - - - - - - - - Specifies the NixOS target host. By setting this to something other than - an empty string, the system activation will happen - on the remote host instead of the local machine. The remote host needs to - be accessible over ssh, and for the commands , - and you need root access. - - - - If is not explicitly specified or empty, - building will take place locally. - - - - You can include a remote user name in the host name - (user@host). You can also set ssh options by - defining the NIX_SSHOPTS environment variable. - - - - Note that nixos-rebuild honors the - nixpkgs.crossSystem setting of the given configuration - but disregards the true architecture of the target host. Hence the - nixpkgs.crossSystem setting has to match the target - platform or else activation will fail. - - - - - - - - - - - When set, nixos-rebuild will add - to each invocation of nix-copy-closure. This will only affect the - behavior of nixos-rebuild if or - is also set. This is useful when - the target-host connection to cache.nixos.org is faster than the - connection between hosts. - - - - - - - - - - - When set, nixos-rebuild prefixes remote commands that run on - the and - systems with sudo. Setting this option allows - deploying as a non-root user. - - - - - - - flake-uri#name - - - - Build the NixOS system from the specified flake. It defaults to - the directory containing the target of the symlink - /etc/nixos/flake.nix, if it exists. The - flake must contain an output named - nixosConfigurations.name. If - name is omitted, it default to the - current host name. - - - - - - - - - - - Do not imply if - /etc/nixos/flake.nix exists. With this - option, it is possible to build non-flake NixOS configurations - even if the current NixOS systems uses flakes. - - - - - - - - In addition, nixos-rebuild accepts various Nix-related - flags, including / , , - , , - , , and / - . See the Nix manual for details. - - - - - Environment - - - - - NIXOS_CONFIG - - - - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. - - - - - - - NIX_PATH - - - - A colon-separated list of directories used to look up Nix expressions enclosed in angle brackets (e.g <nixpkgs>). Example - - nixpkgs=./my-nixpkgs - - - - - - - - NIX_SSHOPTS - - - - Additional options to be passed to ssh on the command - line. - - - - - - - - Files - - - - - - /etc/nixos/flake.nix - - - - If this file exists, then nixos-rebuild will - use it as if the option was given. This - file may be a symlink to a flake.nix in an - actual flake; thus /etc/nixos need not be a - flake. - - - - - - - /run/current-system - - - - A symlink to the currently active system configuration in the Nix store. - - - - - - - /nix/var/nix/profiles/system - - - - The Nix profile that contains the current and previous system - configurations. Used to generate the GRUB boot menu. - - - - - - - - - Bugs - - This command should be renamed to something more descriptive. - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml deleted file mode 100644 index 507c5035ed..0000000000 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - nixos-version - 8 - NixOS - - - nixos-version - show the NixOS version - - - - nixos-version - - - - - - - - - - - - - - - - - - - - - Description - - This command shows the version of the currently active NixOS configuration. - For example: -$ nixos-version -16.03.1011.6317da4 (Emu) - - The version consists of the following elements: - - - - 16.03 - - - - The NixOS release, indicating the year and month in which it was - released (e.g. March 2016). - - - - - - 1011 - - - - The number of commits in the Nixpkgs Git repository between the start of - the release branch and the commit from which this version was built. - This ensures that NixOS versions are monotonically increasing. It is - git when the current NixOS configuration was built - from a checkout of the Nixpkgs Git repository rather than from a NixOS - channel. - - - - - - 6317da4 - - - - The first 7 characters of the commit in the Nixpkgs Git repository from - which this version was built. - - - - - - Emu - - - - The code name of the NixOS release. The first letter of the code name - indicates that this is the N'th stable NixOS release; for example, Emu - is the fifth release. - - - - - - - - - Options - - - This command accepts the following options: - - - - - - - - - - - - - - Show the full SHA1 hash of the Git commit from which this configuration - was built, e.g. -$ nixos-version --hash -6317da40006f6bc2480c6781999c52d88dde2acf - - - - - - - - - - - - Show the configuration revision if available. This could be the full SHA1 - hash of the Git commit of the system flake, if you add - { system.configurationRevision = self.rev or "dirty"; } - to the modules array of your flake.nix system configuration e.g. -$ nixos-version --configuration-revision -aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 - - - - - - - - - - - - Print a JSON representation of the versions of NixOS and the - top-level configuration flake. - - - - - - - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/man-pages.xml b/third_party/nixpkgs/nixos/doc/manual/man-pages.xml index 58f73521e9..0186221bdd 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-pages.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-pages.xml @@ -15,11 +15,4 @@ - - - - - - - diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/README.md b/third_party/nixpkgs/nixos/doc/manual/manpages/README.md new file mode 100644 index 0000000000..9923f48239 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/README.md @@ -0,0 +1,57 @@ +# NixOS manpages + +This is the collection of NixOS manpages, excluding `configuration.nix(5)`. + +Man pages are written in [`mdoc(7)` format](https://mandoc.bsd.lv/man/mdoc.7.html) and should be portable between mandoc and groff for rendering (though minor differences may occur, mandoc and groff seem to have slightly different spacing rules.) + +For previewing edited files, you can just run `man -l path/to/file.8` and you will see it rendered. + +Being written in `mdoc` these manpages use semantic markup. This file provides a guideline on where to apply which of the semantic elements of `mdoc`. + +### Command lines and arguments + +In any manpage, commands, flags and arguments to the *current* executable should be marked according to their semantics. Commands, flags and arguments passed to *other* executables should not be marked like this and should instead be considered as code examples and marked with `Ql`. + + - Use `Fl` to mark flag arguments, `Ar` for their arguments. + - Repeating arguments should be marked by adding ellipses (`...`). + - Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`. + - Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments. + - Required flags or arguments should not be marked. + - Mutually exclusive groups of arguments should be enclosed in curly brackets, preferrably created with `Bro`/`Brc` blocks. + +When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` flag that calls ssh to retrieve the host's local time would signify this thusly: +``` +This will run +.Ic ssh Ar name Ic time +to retrieve the remote time. +``` + +### Paths, NixOS options, environment variables + +Constant paths should be marked with `Pa`, NixOS options with `Va`, and environment variables with `Ev`. + +Generated paths, e.g. `result/bin/run-hostname-vm` (where `hostname` is a variable or arguments) should be marked as `Ql` inline literals with their variable components marked appropriately. + + - Taking `hostname` from an argument become `.Ql result/bin/run- Ns Ar hostname Ns -vm` + - Taking `hostname` from a variable otherwise defined becomes `.Ql result/bin/run- Ns Va hostname Ns -vm` + +### Code examples and other commands + +In free text names and complete invocations of other commands (e.g. `ssh` or `tar -xvf src.tar`) should be marked with `Ic`, fragments of command lines should be marked with `Ql`. + +Larger code blocks or those that cannot be shown inline should use indented literal display block markup for their contents, i.e. +``` +.Bd -literal -offset indent +... +.Ed +``` +Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be subsituted into them: +``` +.Bd -literal -offset indent +{ + options.hostname = "\c +.Ar hostname Ns \c +"; +} +.Ed +``` diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-build-vms.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-build-vms.8 new file mode 100644 index 0000000000..abf06b5dd5 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-build-vms.8 @@ -0,0 +1,109 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-build-vms \&8 "NixOS System Manager's Manual" +.el .Dt nixos-build-vms 8 +.Os NixOS +.Sh NAME +.Nm nixos-build-vms +.Nd build a network of virtual machines from a network of NixOS configurations +. +. +. +.Sh SYNOPSIS +.Nm nixos-build-vms +.Op Fl -show-trace +.Op Fl -no-out-link +.Op Fl -help +.Op Fl -option Ar name value +.Pa network.nix +. +. +. +.Sh DESCRIPTION +. +This command builds a network of QEMU\-KVM virtual machines of a Nix expression +specifying a network of NixOS machines. The virtual network can be started by +executing the +.Pa bin/run-vms +shell script that is generated by this command. By default, a +.Pa result +symlink is produced that points to the generated virtual network. +. +.Pp +A network Nix expression has the following structure: +.Bd -literal -offset indent +{ + test1 = {pkgs, config, ...}: + { + services.openssh.enable = true; + nixpkgs.localSystem.system = "i686-linux"; + deployment.targetHost = "test1.example.net"; + + # Other NixOS options + }; + + test2 = {pkgs, config, ...}: + { + services.openssh.enable = true; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.lynx ]; + nixpkgs.localSystem.system = "x86_64-linux"; + deployment.targetHost = "test2.example.net"; + + # Other NixOS options + }; +} +.Ed +. +.Pp +Each attribute in the expression represents a machine in the network +.Ns (e.g. +.Va test1 +and +.Va test2 Ns +) referring to a function defining a NixOS configuration. In each NixOS +configuration, two attributes have a special meaning. The +.Va deployment.targetHost +specifies the address (domain name or IP address) of the system which is used by +.Ic ssh +to perform remote deployment operations. The +.Va nixpkgs.localSystem.system +attribute can be used to specify an architecture for the target machine, such as +.Ql i686-linux +which builds a 32-bit NixOS configuration. Omitting this property will build the +configuration for the same architecture as the host system. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -show-trace +Shows a trace of the output. +. +.It Fl -no-out-link +Do not create a +.Pa result +symlink. +. +.It Fl h , -help +Shows the usage of this command to the user. +. +.It Fl -option Ar name Va value +Set the Nix configuration option +.Va name +to +.Va value Ns +\&. This overrides settings in the Nix configuration file (see +.Xr nix.conf 5 Ns +). +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-enter.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-enter.8 new file mode 100644 index 0000000000..bc8df31e5f --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-enter.8 @@ -0,0 +1,76 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-enter \&8 "NixOS System Manager's Manual" +.el .Dt nixos-enter 8 +.Os NixOS +.Sh NAME +.Nm nixos-enter +.Nd run a command in a NixOS chroot environment +. +. +. +.Sh SYNOPSIS +.Nm nixos-enter +.Op Fl -root Ar root +.Op Fl -system Ar system +.Op Fl -command | c Ar shell-command +.Op Fl -silent +.Op Fl -help +.Op Fl - Ar arguments ... +. +. +. +.Sh DESCRIPTION +This command runs a command in a NixOS chroot environment, that is, in a filesystem hierarchy previously prepared using +.Xr nixos-install 8 . +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -root Ar root +The path to the NixOS system you want to enter. It defaults to +.Pa /mnt Ns +\&. +.It Fl -system Ar system +The NixOS system configuration to use. It defaults to +.Pa /nix/var/nix/profiles/system Ns +\&. You can enter a previous NixOS configuration by specifying a path such as +.Pa /nix/var/nix/profiles/system-106-link Ns +\&. +. +.It Fl -command Ar shell-command , Fl c Ar shell-command +The bash command to execute. +. +.It Fl -silent +Suppresses all output from the activation script of the target system. +. +.It Fl - +Interpret the remaining arguments as the program name and arguments to be invoked. +The program is not executed in a shell. +.El +. +. +. +.Sh EXAMPLES +.Bl -tag -width indent +.It Ic nixos-enter --root /mnt +Start an interactive shell in the NixOS installation in +.Pa /mnt Ns . +. +.It Ic nixos-enter -c 'ls -l /; cat /proc/mounts' +Run a shell command. +. +.It Ic nixos-enter -- cat /proc/mounts +Run a non-shell command. +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-generate-config.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-generate-config.8 new file mode 100644 index 0000000000..8b9bb4d424 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-generate-config.8 @@ -0,0 +1,169 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-generate-config \&8 "NixOS System Manager's Manual" +.el .Dt nixos-generate-config 8 +.Os NixOS +.Sh NAME +.Nm nixos-generate-config +.Nd generate NixOS configuration modules +. +. +. +.Sh SYNOPSIS +.Nm nixos-generate-config +.Op Fl -force +.Op Fl -root Ar root +.Op Fl -dir Ar dir +. +. +. +.Sh DESCRIPTION +This command writes two NixOS configuration modules: +.Bl -tag -width indent +.It Pa /etc/nixos/hardware-configuration.nix +This module sets NixOS configuration options based on your current hardware +configuration. In particular, it sets the +.Va fileSystem +option to reflect all currently mounted file systems, the +.Va swapDevices +option to reflect active swap devices, and the +.Va boot.initrd.* +options to ensure that the initial ramdisk contains any kernel modules necessary +for mounting the root file system. +.Pp +If this file already exists, it is overwritten. Thus, you should not modify it +manually. Rather, you should include it from your +.Pa /etc/nixos/configuration.nix Ns +, and re-run +.Nm +to update it whenever your hardware configuration changes. +. +.It Pa /etc/nixos/configuration.nix +This is the main NixOS system configuration module. If it already exists, it’s +left unchanged. Otherwise, +.Nm +will write a template for you to customise. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -root Ar root +If this option is given, treat the directory +.Ar root +as the root of the file system. This means that configuration files will be written to +.Ql Ar root Ns /etc/nixos Ns +, and that any file systems outside of +.Ar root +are ignored for the purpose of generating the +.Va fileSystems +option. +. +.It Fl -dir Ar dir +If this option is given, write the configuration files to the directory +.Ar dir +instead of +.Pa /etc/nixos Ns +\&. +. +.It Fl -force +Overwrite +.Pa /etc/nixos/configuration.nix +if it already exists. +. +.It Fl -no-filesystems +Omit everything concerning file systems and swap devices from the hardware configuration. +. +.It Fl -show-hardware-config +Don't generate +.Pa configuration.nix +or +.Pa hardware-configuration.nix +and print the hardware configuration to stdout only. +.El +. +. +. +.Sh EXAMPLES +This command is typically used during NixOS installation to write initial +configuration modules. For example, if you created and mounted the target file +systems on +.Pa /mnt +and +.Pa /mnt/boot Ns +, you would run: +.Bd -literal -offset indent +$ nixos-generate-config --root /mnt +.Ed +. +.Pp +The resulting file +.Pa /mnt/etc/nixos/hardware-configuration.nix +might look like this: +.Bd -literal -offset indent +# Do not modify this file! It was generated by 'nixos-generate-config' +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, pkgs, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/nixos"; + fsType = "ext3"; + options = [ "rw" "data=ordered" "relatime" ]; + }; + + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext3"; + options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ]; + }; + + swapDevices = + [ { device = "/dev/sda2"; } + ]; + + nix.maxJobs = 8; +} +.Ed +. +.Pp +It will also create a basic +.Pa /mnt/etc/nixos/configuration.nix Ns +, which you should edit to customise the logical configuration of your system. \ +This file includes the result of the hardware scan as follows: +.Bd -literal -offset indent +imports = [ ./hardware-configuration.nix ]; +.Ed +. +.Pp +After installation, if your hardware configuration changes, you can run: +.Bd -literal -offset indent +$ nixos-generate-config +.Ed +. +.Pp +to update +.Pa /etc/nixos/hardware-configuration.nix Ns +\&. Your +.Pa /etc/nixos/configuration.nix +will +.Em not +be overwritten. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-install.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-install.8 new file mode 100644 index 0000000000..dc0a5da275 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-install.8 @@ -0,0 +1,195 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-install \&8 "NixOS System Manager's Manual" +.el .Dt nixos-install 8 +.Os NixOS +.Sh NAME +.Nm nixos-install +.Nd install bootloader and NixOS +. +. +. +.Sh SYNOPSIS +.Nm nixos-install +.Op Fl -verbose | v +.Op Fl I Ar path +.Op Fl -root Ar root +.Op Fl -system Ar path +.Op Fl -flake Ar flake-uri +.Op Fl -impure +.Op Fl -channel Ar channel +.Op Fl -no-channel-copy +.Op Fl -no-root-password | -no-root-passwd +.Op Fl -no-bootloader +.Op Fl -max-jobs | j Ar number +.Op Fl -cores Ar number +.Op Fl -option Ar name value +.Op Fl -show-trace +.Op Fl -keep-going +.Op Fl -help +. +. +. +.Sh DESCRIPTION +This command installs NixOS in the file system mounted on +.Pa /mnt Ns +, based on the NixOS configuration specified in +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. It performs the following steps: +. +.Bl -enum +.It +It copies Nix and its dependencies to +.Pa /mnt/nix/store Ns +\&. +. +.It +It runs Nix in +.Pa /mnt +to build the NixOS configuration specified in +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. +. +.It +It installs the current channel +.Dq nixos +in the target channel profile (unless +.Fl -no-channel-copy +is specified). +. +.It +It installs the GRUB boot loader on the device specified in the option +.Va boot.loader.grub.device +(unless +.Fl -no-bootloader +is specified), and generates a GRUB configuration file that boots into the NixOS +configuration just installed. +. +.It +It prompts you for a password for the root account (unless +.Fl -no-root-password +is specified). +.El +. +.Pp +This command is idempotent: if it is interrupted or fails due to a temporary +problem (e.g. a network issue), you can safely re-run it. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -verbose , v +Increases the level of verbosity of diagnostic messages printed on standard +error. For each Nix operation, the information printed on standard output is +well-defined; any diagnostic information is printed on standard error, never on +standard output. +.Pp +Please note that this option may be specified repeatedly. +. +.It Fl -root Ar root +Defaults to +.Pa /mnt Ns +\&. If this option is given, treat the directory +.Ar root +as the root of the NixOS installation. +. +.It Fl -system Ar path +If this option is provided, +.Nm +will install the specified closure rather than attempt to build one from +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. +.Pp +The closure must be an appropriately configured NixOS system, with boot loader +and partition configuration that fits the target host. Such a closure is +typically obtained with a command such as +.Ic nix-build -I nixos-config=./configuration.nix '' -A system --no-out-link Ns +\&. +. +.It Fl -flake Ar flake-uri Ns # Ns Ar name +Build the NixOS system from the specified flake. The flake must contain an +output named +.Ql nixosConfigurations. Ns Ar name Ns +\&. +. +.It Fl -channel Ar channel +If this option is provided, do not copy the current +.Dq nixos +channel to the target host. Instead, use the specified derivation. +. +.It Fl I Ar Path +Add a path to the Nix expression search path. This option may be given multiple +times. See the +.Ev NIX_PATH +environment variable for information on the semantics of the Nix search path. Paths added through +.Fl I +take precedence over +.Ev NIX_PATH Ns +\&. +. +.It Fl -max-jobs , j Ar number +Sets the maximum number of build jobs that Nix will perform in parallel to the +specified number. The default is 1. A higher value is useful on SMP systems or +to exploit I/O latency. +. +.It Fl -cores Ar N +Sets the value of the +.Ev NIX_BUILD_CORES +environment variable in the invocation of builders. Builders can use this +variable at their discretion to control the maximum amount of parallelism. For +instance, in Nixpkgs, if the derivation attribute +.Va enableParallelBuilding +is set to true, the builder passes the +.Fl j Ns Va N +flag to GNU Make. The value 0 means that the builder should use all available CPU cores in the system. +. +.It Fl -option Ar name value +Set the Nix configuration option +.Ar name +to +.Ar value Ns +\&. +. +.It Fl -show-trace +Causes Nix to print out a stack trace in case of Nix expression evaluation errors. +. +.It Fl -keep-going +Causes Nix to continue building derivations as far as possible in the face of failed builds. +. +.It Fl -help +Synonym for +.Ic man nixos-install Ns +\&. +.El +. +. +. +.Sh EXAMPLES +A typical NixOS installation is done by creating and mounting a file system on +.Pa /mnt Ns +, generating a NixOS configuration in +.Pa /mnt/etc/nixos/configuration.nix Ns +, and running +.Nm Ns +\&. For instance, if we want to install NixOS on an ext4 file system created in +.Pa /dev/sda1 Ns +: +.Bd -literal -offset indent +$ mkfs.ext4 /dev/sda1 +$ mount /dev/sda1 /mnt +$ nixos-generate-config --root /mnt +$ # edit /mnt/etc/nixos/configuration.nix +$ nixos-install +$ reboot +.Ed +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-option.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-option.8 new file mode 100644 index 0000000000..79cc113cfa --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-option.8 @@ -0,0 +1,93 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-option \&8 "NixOS System Manager's Manual" +.el .Dt nixos-option 8 +.Os NixOS +.Sh NAME +.Nm nixos-option +.Nd inspect a NixOS configuration +. +. +. +.Sh SYNOPSIS +.Nm +.Op Fl r | -recursive +.Op Fl I Ar path +.Ar option.name +. +. +. +.Sh DESCRIPTION +This command evaluates the configuration specified in +.Pa /etc/nixos/configuration.nix +and returns the properties of the option name given as argument. +. +.Pp +When the option name is not an option, the command prints the list of attributes +contained in the attribute set. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl r , -recursive +Print all the values at or below the specified path recursively. +. +.It Fl I Ar path +This option is passed to the underlying +.Xr nix-instantiate 1 +invocation. +.El +. +. +. +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev NIXOS_CONFIG +Path to the main NixOS configuration module. Defaults to +.Pa /etc/nixos/configuration.nix Ns +\&. +.El +. +. +. +.Sh EXAMPLES +Investigate option values: +.Bd -literal -offset indent +$ nixos-option boot.loader +This attribute set contains: +generationsDir +grub +initScript + +$ nixos-option boot.loader.grub.enable +Value: +true + +Default: +true + +Description: +Whether to enable the GNU GRUB boot loader. + +Declared by: + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" + +Defined by: + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" +.Ed +. +. +. +.Sh SEE ALSO +.Xr configuration.nix 5 +. +. +. +.Sh AUTHORS +.An -nosplit +.An Nicolas Pierron +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-rebuild.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-rebuild.8 new file mode 100644 index 0000000000..8ff59d6da9 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-rebuild.8 @@ -0,0 +1,456 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-rebuild \&8 "NixOS System Manager's Manual" +.el .Dt nixos-rebuild 8 +.Os NixOS +.Sh NAME +.Nm nixos-rebuild +.Nd reconfigure a NixOS machine +. +. +. +.Sh SYNOPSIS +.Nm +.Bro +.Cm switch | boot | test | build | dry-build | dry-activate | edit | build-vm | build-vm-with-bootloader +.Brc +.br +.Op Fl -upgrade | -upgrade-all +.Op Fl -install-bootloader +.Op Fl -no-build-nix +.Op Fl -fast +.Op Fl -rollback +.Op Fl -builders Ar builder-spec +.br +.Op Fl -flake Ar flake-uri +.Op Fl -no-flake +.Op Fl -override-input Ar input-name flake-uri +.br +.Op Fl -profile-name | p Ar name +.Op Fl -specialisation | c Ar name +.br +.Op Fl -build-host Va host +.Op Fl -target-host Va host +.Op Fl -use-remote-sudo +.br +.Op Fl -show-trace +.Op Fl I Va NIX_PATH +.Op Fl -verbose | v +.Op Fl -impure +.Op Fl -max-jobs | j Va number +.Op Fl -keep-failed | K +.Op Fl -keep-going | k +. +. +. +.Sh DESCRIPTION +This command updates the system so that it corresponds to the +configuration specified in +.Pa /etc/nixos/configuration.nix +or +.Pa /etc/nixos/flake.nix Ns +\&. Thus, every time you modify the configuration or any other NixOS module, you +must run +.Nm +to make the changes take effect. It builds the new system in +.Pa /nix/store Ns +, runs its activation script, and stop and (re)starts any system services if +needed. Please note that user services need to be started manually as they +aren't detected by the activation script at the moment. +. +.Pp +This command has one required argument, which specifies the desired +operation. It must be one of the following: +.Bl -tag -width indent +.It Cm switch +Build and activate the new configuration, and make it the boot default. That +is, the configuration is added to the GRUB boot menu as the default +menu entry, so that subsequent reboots will boot the system into the new +configuration. Previous configurations activated with +.Ic nixos-rebuild switch +or +.Ic nixos-rebuild boot +remain available in the GRUB menu. +.Pp +Note that if you are using specializations, running just +.Ic nixos-rebuild switch +will switch you back to the unspecialized, base system \(em in that case, you +might want to use this instead: +.Bd -literal -offset indent +$ nixos-rebuild switch --specialisation your-specialisation-name +.Ed +.Pp +This command will build all specialisations and make them bootable just +like regular +.Ic nixos-rebuild switch +does \(em the only thing different is that it will switch to given +specialisation instead of the base system; it can be also used to switch from +the base system into a specialised one, or to switch between specialisations. +. +.It Cm boot +Build the new configuration and make it the boot default (as with +.Ic nixos-rebuild switch Ns +), but do not activate it. That is, the system continues to run the previous +configuration until the next reboot. +. +.It Cm test +Build and activate the new configuration, but do not add it to the GRUB +boot menu. Thus, if you reboot the system (or if it crashes), you will +automatically revert to the default configuration (i.e. the +configuration resulting from the last call to +.Ic nixos-rebuild switch +or +.Ic nixos-rebuild boot Ns +). +.Pp +Note that if you are using specialisations, running just +.Ic nixos-rebuild test +will activate the unspecialised, base system \(em in that case, you might want +to use this instead: +.Bd -literal -offset indent +$ nixos-rebuild test --specialisation your-specialisation-name +.Ed +.Pp +This command can be also used to switch from the base system into a +specialised one, or to switch between specialisations. +. +.It Cm build +Build the new configuration, but neither activate it nor add it to the +GRUB boot menu. It leaves a symlink named +.Pa result +in the current directory, which points to the output of the top-level +.Dq system +derivation. This is essentially the same as doing +.Bd -literal -offset indent +$ nix-build /path/to/nixpkgs/nixos -A system +.Ed +.Pp +Note that you do not need to be root to run +.Ic nixos-rebuild build Ns +\&. +. +.It Cm dry-build +Show what store paths would be built or downloaded by any of the +operations above, but otherwise do nothing. +. +.It Cm dry-activate +Build the new configuration, but instead of activating it, show what +changes would be performed by the activation (i.e. by +.Ic nixos-rebuild test Ns +). For instance, this command will print which systemd units would be restarted. +The list of changes is not guaranteed to be complete. +. +.It Cm edit +Opens +.Pa configuration.nix +in the default editor. +. +.It Cm build-vm +Build a script that starts a NixOS virtual machine with the desired +configuration. It leaves a symlink +.Pa result +in the current directory that points (under +.Ql result/bin/run\- Ns Va hostname Ns \-vm Ns +) +at the script that starts the VM. Thus, to test a NixOS configuration in +a virtual machine, you should do the following: +.Bd -literal -offset indent +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm +.Ed +.Pp +The VM is implemented using the +.Ql qemu +package. For best performance, you should load the +.Ql kvm-intel +or +.Ql kvm-amd +kernel modules to get hardware virtualisation. +.Pp +The VM mounts the Nix store of the host through the 9P file system. The +host Nix store is read-only, so Nix commands that modify the Nix store +will not work in the VM. This includes commands such as +.Nm Ns +; to change the VM’s configuration, you must halt the VM and re-run the commands +above. +.Pp +The VM has its own ext3 root file system, which is automatically created when +the VM is first started, and is persistent across reboots of the VM. It is +stored in +.Ql ./ Ns Va hostname Ns .qcow2 Ns +\&. +.\" The entire file system hierarchy of the host is available in +.\" the VM under +.\" .Pa /hostfs Ns +.\" . +. +.It Cm build-vm-with-bootloader +Like +.Cm build-vm Ns +, but boots using the regular boot loader of your configuration (e.g. GRUB 1 or +2), rather than booting directly into the kernel and initial ramdisk of the +system. This allows you to test whether the boot loader works correctly. \ +However, it does not guarantee that your NixOS configuration will boot +successfully on the host hardware (i.e., after running +.Ic nixos-rebuild switch Ns +), because the hardware and boot loader configuration in the VM are different. +The boot loader is installed on an automatically generated virtual disk +containing a +.Pa /boot +partition. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -upgrade , -upgrade-all +Update the root user's channel named +.Ql nixos +before rebuilding the system. +.Pp +In addition to the +.Ql nixos +channel, the root user's channels which have a file named +.Ql .update-on-nixos-rebuild +in their base directory will also be updated. +.Pp +Passing +.Fl -upgrade-all +updates all of the root user's channels. +. +.It Fl -install-bootloader +Causes the boot loader to be (re)installed on the device specified by the +relevant configuration options. +. +.It Fl -no-build-nix +Normally, +.Nm +first builds the +.Ql nixUnstable +attribute in Nixpkgs, and uses the resulting instance of the Nix package manager +to build the new system configuration. This is necessary if the NixOS modules +use features not provided by the currently installed version of Nix. This option +disables building a new Nix. +. +.It Fl -fast +Equivalent to +.Fl -no-build-nix Ns +\&. This option is useful if you call +.Nm +frequently (e.g. if you’re hacking on a NixOS module). +. +.It Fl -rollback +Instead of building a new configuration as specified by +.Pa /etc/nixos/configuration.nix Ns +, roll back to the previous configuration. (The previous configuration is +defined as the one before the “current” generation of the Nix profile +.Pa /nix/var/nix/profiles/system Ns +\&.) +. +.It Fl -builders Ar builder-spec +Allow ad-hoc remote builders for building the new system. This requires +the user executing +.Nm +(usually root) to be configured as a trusted user in the Nix daemon. This can be +achieved by using the +.Va nix.settings.trusted-users +NixOS option. Examples values for that option are described in the +.Dq Remote builds +chapter in the Nix manual, (i.e. +.Ql --builders \(dqssh://bigbrother x86_64-linux\(dq Ns +). By specifying an empty string existing builders specified in +.Pa /etc/nix/machines +can be ignored: +.Ql --builders \(dq\(dq +for example when they are not reachable due to network connectivity. +. +.It Fl -profile-name Ar name , Fl p Ar name +Instead of using the Nix profile +.Pa /nix/var/nix/profiles/system +to keep track of the current and previous system configurations, use +.Pa /nix/var/nix/profiles/system-profiles/ Ns Va name Ns +\&. When you use GRUB 2, for every system profile created with this flag, NixOS +will create a submenu named +.Dq NixOS - Profile Va name +in GRUB’s boot menu, containing the current and previous configurations of this profile. +.Pp +For instance, if you want to test a configuration file named +.Pa test.nix +without affecting the default system profile, you would do: +.Bd -literal -offset indent +$ nixos-rebuild switch -p test -I nixos-config=./test.nix +.Ed +.Pp +The new configuration will appear in the GRUB 2 submenu +.Dq NixOS - Profile 'test' Ns +\&. +. +.It Fl -specialisation Ar name , Fl c Ar name +Activates given specialisation; when not specified, switching and testing +will activate the base, unspecialised system. +. +.It Fl -build-host Ar host +Instead of building the new configuration locally, use the specified host +to perform the build. The host needs to be accessible with +.Ic ssh Ns , +and must be able to perform Nix builds. If the option +.Fl -target-host +is not set, the build will be copied back to the local machine when done. +.Pp +Note that, if +.Fl -no-build-nix +is not specified, Nix will be built both locally and remotely. This is because +the configuration will always be evaluated locally even though the building +might be performed remotely. +.Pp +You can include a remote user name in the host name +.Ns ( Va user@host Ns +). You can also set ssh options by defining the +.Ev NIX_SSHOPTS +environment variable. +. +.It Fl -target-host Ar host +Specifies the NixOS target host. By setting this to something other than an +empty string, the system activation will happen on the remote host instead of +the local machine. The remote host needs to be accessible over +.Ic ssh Ns , +and for the commands +.Cm switch Ns +, +.Cm boot +and +.Cm test +you need root access. +.Pp +If +.Fl -build-host +is not explicitly specified or empty, building will take place locally. +.Pp +You can include a remote user name in the host name +.Ns ( Va user@host Ns +). You can also set ssh options by defining the +.Ev NIX_SSHOPTS +environment variable. +.Pp +Note that +.Nm +honors the +.Va nixpkgs.crossSystem +setting of the given configuration but disregards the true architecture of the +target host. Hence the +.Va nixpkgs.crossSystem +setting has to match the target platform or else activation will fail. +. +.It Fl -use-substitutes +When set, nixos-rebuild will add +.Fl -use-substitutes +to each invocation of nix-copy-closure. This will only affect the behavior of +nixos-rebuild if +.Fl -target-host +or +.Fl -build-host +is also set. This is useful when the target-host connection to cache.nixos.org +is faster than the connection between hosts. +. +.It Fl -use-remote-sudo +When set, nixos-rebuild prefixes remote commands that run on the +.Fl -build-host +and +.Fl -target-host +systems with +.Ic sudo Ns +\&. Setting this option allows deploying as a non-root user. +. +.It Fl -flake Va flake-uri Ns Op Va #name +Build the NixOS system from the specified flake. It defaults to the directory +containing the target of the symlink +.Pa /etc/nixos/flake.nix Ns +, if it exists. The flake must contain an output named +.Ql nixosConfigurations. Ns Va name Ns +\&. If +.Va name +is omitted, it default to the current host name. +. +.It Fl -no-flake +Do not imply +.Fl -flake +if +.Pa /etc/nixos/flake.nix +exists. With this option, it is possible to build non-flake NixOS configurations +even if the current NixOS systems uses flakes. +.El +.Pp +In addition, +.Nm +accepts various Nix-related flags, including +.Fl -max-jobs Ns , +.Fl j Ns , +.Fl I Ns , +.Fl -show-trace Ns , +.Fl -keep-failed Ns , +.Fl -keep-going Ns , +.Fl -impure Ns , +.Fl -verbose Ns , and +.Fl v Ns +\&. See the Nix manual for details. +. +. +. +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev NIXOS_CONFIG +Path to the main NixOS configuration module. Defaults to +.Pa /etc/nixos/configuration.nix Ns +\&. +. +.It Ev NIX_PATH +A colon-separated list of directories used to look up Nix expressions enclosed +in angle brackets (e.g. ). Example: +.Bd -literal -offset indent +nixpkgs=./my-nixpkgs +.Ed +. +.It Ev NIX_SSHOPTS +Additional options to be passed to +.Ic ssh +on the command line. +.El +. +. +. +.Sh FILES +.Bl -tag -width indent +.It Pa /etc/nixos/flake.nix +If this file exists, then +.Nm +will use it as if the +.Fl -flake +option was given. This file may be a symlink to a +.Pa flake.nix +in an actual flake; thus +.Pa /etc/nixos +need not be a flake. +. +.It Pa /run/current-system +A symlink to the currently active system configuration in the Nix store. +. +.It Pa /nix/var/nix/profiles/system +The Nix profile that contains the current and previous system +configurations. Used to generate the GRUB boot menu. +.El +. +. +. +.Sh BUGS +This command should be renamed to something more descriptive. +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-version.8 b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-version.8 new file mode 100644 index 0000000000..980ee8b1f4 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/manpages/nixos-version.8 @@ -0,0 +1,90 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-version \&8 "NixOS System Manager's Manual" +.el .Dt nixos-version 8 +.Os NixOS +.Sh NAME +.Nm nixos-version +.Nd show the NixOS version +. +. +. +.Sh SYNOPSIS +.Nm nixos-version +.Op Fl -hash +.Op Fl -revision +.Op Fl -configuration-revision +.Op Fl -json +. +. +. +.Sh DESCRIPTION +This command shows the version of the currently active NixOS configuration. For example: +.Bd -literal -offset indent +$ nixos-version +16.03.1011.6317da4 (Emu) +.Ed +. +.Pp +The version consists of the following elements: +.Bl -tag -width indent +.It Ql 16.03 +The NixOS release, indicating the year and month in which it was released +(e.g. March 2016). +.It Ql 1011 +The number of commits in the Nixpkgs Git repository between the start of the +release branch and the commit from which this version was built. This ensures +that NixOS versions are monotonically increasing. It is +.Ql git +when the current NixOS configuration was built from a checkout of the Nixpkgs +Git repository rather than from a NixOS channel. +.It Ql 6317da4 +The first 7 characters of the commit in the Nixpkgs Git repository from which +this version was built. +.It Ql Emu +The code name of the NixOS release. The first letter of the code name indicates +that this is the N'th stable NixOS release; for example, Emu is the fifth +release. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -hash , -revision +Show the full SHA1 hash of the Git commit from which this configuration was +built, e.g. +.Bd -literal -offset indent +$ nixos-version --hash +6317da40006f6bc2480c6781999c52d88dde2acf +.Ed +. +.It Fl -configuration-revision +Show the configuration revision if available. This could be the full SHA1 hash +of the Git commit of the system flake, if you add +.Bd -literal -offset indent +{ system.configurationRevision = self.rev or "dirty"; } +.Ed +.Pp +to the +.Ql modules +array of your flake.nix system configuration e.g. +.Bd -literal -offset indent +$ nixos-version --configuration-revision +aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 +.Ed +. +.It Fl -json +Print a JSON representation of the versions of NixOS and the top-level +configuration flake. +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md index 96f6767321..b7614c0788 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md @@ -38,7 +38,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). -- [QDMR](https://dm3mat.darc.de/qdmr/), a gui application and command line tool for programming cheap DMR radios [programs.qdmr](#opt-programs.qdmr.enable) +- [QDMR](https://dm3mat.darc.de/qdmr/), a GUI application and command line tool for programming DMR radios [programs.qdmr](#opt-programs.qdmr.enable) - [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable). @@ -48,13 +48,17 @@ In addition to numerous new and upgraded packages, this release has the followin - [autosuspend](https://github.com/languitar/autosuspend), a python daemon that suspends a system if certain conditions are met, or not met. +- [sharing](https://github.com/parvardegr/sharing), a command-line tool to share directories and files from the CLI to iOS and Android devices without the need of an extra client app. Available as [programs.sharing](#opt-programs.sharing.enable). + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} - `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead. -- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust and go packages). +- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust, ocaml and go packages). + +- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`. - `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). @@ -97,6 +101,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. +- Nebula now runs as a system user and group created for each nebula network, using the `CAP_NET_ADMIN` ambient capability on launch rather than starting as root. Ensure that any files each Nebula instance needs to access are owned by the correct user and group, by default `nebula-${networkName}`. + - In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`. - The `--target-host` and `--build-host` options of `nixos-rebuild` no longer treat the `localhost` value specially – to build on/deploy to local machine, omit the relevant flag. @@ -122,7 +128,17 @@ In addition to numerous new and upgraded packages, this release has the followin - The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package) -- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follow: `services.openssh.kbdInteractiveAuthentication` to `services.openssh.settings.KbdInteractiveAuthentication`, `services.openssh.passwordAuthentication` to `services.openssh.settings.PasswordAuthentication`, `services.openssh.useDns` to `services.openssh.settings.UseDns`, `services.openssh.permitRootLogin` to `services.openssh.settings.PermitRootLogin`, `services.openssh.logLevel` to `services.openssh.settings.LogLevel`. +- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follows: + - `services.openssh.forwardX11` to `services.openssh.settings.X11Forwarding` + - `services.openssh.kbdInteractiveAuthentication` -> `services.openssh.settings.KbdInteractiveAuthentication` + - `services.openssh.passwordAuthentication` to `services.openssh.settings.PasswordAuthentication` + - `services.openssh.useDns` to `services.openssh.settings.UseDns` + - `services.openssh.permitRootLogin` to `services.openssh.settings.PermitRootLogin` + - `services.openssh.logLevel` to `services.openssh.settings.LogLevel` + - `services.openssh.kexAlgorithms` to `services.openssh.settings.KexAlgorithms` + - `services.openssh.macs` to `services.openssh.settings.Macs` + - `services.openssh.ciphers` to `services.openssh.settings.Ciphers` + - `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts` - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. @@ -175,6 +191,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.grafana` listens only on localhost by default again. This was changed to upstreams default of `0.0.0.0` by accident in the freeform setting conversion. +- Grafana Tempo has been updated to version 2.0. See the [upstream upgrade guide](https://grafana.com/docs/tempo/latest/release-notes/v2-0/#upgrade-considerations) for migration instructions. + - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). - The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically. @@ -193,6 +211,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion). +- Nebula now supports the `services.nebula.networks..isRelay` and `services.nebula.networks..relays` configuration options for setting up or allowing traffic relaying. See the [announcement](https://www.defined.net/blog/announcing-relay-support-in-nebula/) for more details about relays. + - `hip` has been separated into `hip`, `hip-common` and `hipcc`. - `services.nginx.recommendedProxySettings` now removes the `Connection` header preventing clients from closing backend connections. @@ -203,12 +223,30 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)). +- The `zramSwap` is now implemented with `zram-generator`, and the option `zramSwap.numDevices` for using ZRAM devices as general purpose ephemeral block devices has been removed. + +- As Singularity has renamed to [Apptainer](https://apptainer.org/news/community-announcement-20211130) + to distinguish from [an un-renamed fork by Sylabs Inc.](https://sylabs.io/2021/05/singularity-community-edition), + there are now two packages of Singularity/Apptainer: + * `apptainer`: From `github.com/apptainer/apptainer`, which is the new repo after renaming. + * `singularity`: From `github.com/sylabs/singularity`, which is the fork by Sylabs Inc.. + + `programs.singularity` got a new `package` option to specify which package to use. + + `singularity-tools.buildImage` got a new input argument `singularity` to specify which package to use. + +- The new option `programs.singularity.enableFakeroot`, if set to `true`, provides `--fakeroot` support for `apptainer` and `singularity`. + - The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream. - The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting. - [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package. +- `tvbrowser-bin` was removed, and now `tvbrowser` is built from source. + - `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision - The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path. + +- The option `services.prometheus.exporters.pihole.interval` does not exist anymore and has been removed. diff --git a/third_party/nixpkgs/nixos/lib/make-channel.nix b/third_party/nixpkgs/nixos/lib/make-channel.nix index 9b920b989f..0a511468fb 100644 --- a/third_party/nixpkgs/nixos/lib/make-channel.nix +++ b/third_party/nixpkgs/nixos/lib/make-channel.nix @@ -23,7 +23,7 @@ pkgs.releaseTools.makeSourceTarball { cp -prd . ../$releaseName chmod -R u+w ../$releaseName ln -s . ../$releaseName/nixpkgs # hack to make ‘’ work - NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null + NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --show-trace --xml \* > /dev/null cd .. chmod -R u+w $releaseName tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix index 271af9ba18..09b0191d2b 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix @@ -78,7 +78,7 @@ let title = args.title or null; name = args.name or (lib.concatStringsSep "." args.path); in '' - - [`${lib.optionalString (title != null) "${title} aka "}pkgs.${name}`]( + - [${lib.optionalString (title != null) "${title} aka "}`pkgs.${name}`]( https://search.nixos.org/packages?show=${name}&sort=relevance&query=${name} )${ lib.optionalString (args ? comment) "\n\n ${args.comment}" diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py index 8f01833bff..0db7930f49 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py @@ -1,4 +1,4 @@ -from contextlib import _GeneratorContextManager +from contextlib import _GeneratorContextManager, nullcontext from pathlib import Path from queue import Queue from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple @@ -406,25 +406,23 @@ class Machine: return rootlog.nested(msg, my_attrs) def wait_for_monitor_prompt(self) -> str: - with self.nested("waiting for monitor prompt"): - assert self.monitor is not None - answer = "" - while True: - undecoded_answer = self.monitor.recv(1024) - if not undecoded_answer: - break - answer += undecoded_answer.decode() - if answer.endswith("(qemu) "): - break - return answer + assert self.monitor is not None + answer = "" + while True: + undecoded_answer = self.monitor.recv(1024) + if not undecoded_answer: + break + answer += undecoded_answer.decode() + if answer.endswith("(qemu) "): + break + return answer def send_monitor_command(self, command: str) -> str: self.run_callbacks() - with self.nested(f"sending monitor command: {command}"): - message = f"{command}\n".encode() - assert self.monitor is not None - self.monitor.send(message) - return self.wait_for_monitor_prompt() + message = f"{command}\n".encode() + assert self.monitor is not None + self.monitor.send(message) + return self.wait_for_monitor_prompt() def wait_for_unit( self, unit: str, user: Optional[str] = None, timeout: int = 900 @@ -547,7 +545,7 @@ class Machine: self.shell.send("echo ${PIPESTATUS[0]}\n".encode()) rc = int(self._next_newline_closed_block_from_shell().strip()) - return (rc, output.decode()) + return (rc, output.decode(errors="replace")) def shell_interact(self, address: Optional[str] = None) -> None: """Allows you to interact with the guest shell for debugging purposes. @@ -685,9 +683,9 @@ class Machine: retry(tty_matches) def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: - with self.nested(f"sending keys '{chars}'"): + with self.nested(f"sending keys {repr(chars)}"): for char in chars: - self.send_key(char, delay) + self.send_key(char, delay, log=False) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -860,11 +858,15 @@ class Machine: if matches is not None: return - def send_key(self, key: str, delay: Optional[float] = 0.01) -> None: + def send_key( + self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True + ) -> None: key = CHAR_TO_KEY.get(key, key) - self.send_monitor_command(f"sendkey {key}") - if delay is not None: - time.sleep(delay) + context = self.nested(f"sending key {repr(key)}") if log else nullcontext() + with context: + self.send_monitor_command(f"sendkey {key}") + if delay is not None: + time.sleep(delay) def send_console(self, chars: str) -> None: assert self.process diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index c8cf2a04fb..ee55da1e9c 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -89,7 +89,7 @@ with lib; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It’s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix index 1d0bc73cac..e18003c0d4 100644 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -46,8 +46,10 @@ with lib; libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; limesuite = super.limesuite.override { withGui = false; }; + mc = super.mc.override { x11Support = false; }; mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; }; msmtp = super.msmtp.override { withKeyring = false; }; + neofetch = super.neofetch.override { x11Support = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; diff --git a/third_party/nixpkgs/nixos/modules/config/stevenblack.nix b/third_party/nixpkgs/nixos/modules/config/stevenblack.nix index ec68684849..07a0aa339a 100644 --- a/third_party/nixpkgs/nixos/modules/config/stevenblack.nix +++ b/third_party/nixpkgs/nixos/modules/config/stevenblack.nix @@ -15,7 +15,7 @@ let in { options.networking.stevenblack = { - enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist."); + enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist"); block = mkOption { type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); diff --git a/third_party/nixpkgs/nixos/modules/config/zram.nix b/third_party/nixpkgs/nixos/modules/config/zram.nix index 87ac53a60b..4df646cf27 100644 --- a/third_party/nixpkgs/nixos/modules/config/zram.nix +++ b/third_party/nixpkgs/nixos/modules/config/zram.nix @@ -1,45 +1,27 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.zramSwap; - - # don't set swapDevices as mkDefault, so we can detect user had read our warning - # (see below) and made an action (or not) - devicesCount = if cfg.swapDevices != null then cfg.swapDevices else cfg.numDevices; - - devices = map (nr: "zram${toString nr}") (range 0 (devicesCount - 1)); - - modprobe = "${pkgs.kmod}/bin/modprobe"; - - warnings = - assert cfg.swapDevices != null -> cfg.numDevices >= cfg.swapDevices; - flatten [ - (optional (cfg.numDevices > 1 && cfg.swapDevices == null) '' - Using several small zram devices as swap is no better than using one large. - Set either zramSwap.numDevices = 1 or explicitly set zramSwap.swapDevices. - - Previously multiple zram devices were used to enable multithreaded - compression. Linux supports multithreaded compression for 1 device - since 3.15. See https://lkml.org/lkml/2014/2/28/404 for details. - '') - ]; + devices = map (nr: "zram${toString nr}") (lib.range 0 (cfg.swapDevices - 1)); in { + imports = [ + (lib.mkRemovedOptionModule [ "zramSwap" "numDevices" ] "Using ZRAM devices as general purpose ephemeral block devices is no longer supported") + ]; + ###### interface options = { zramSwap = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = lib.mdDoc '' Enable in-memory compressed devices and swap space provided by the zram kernel module. @@ -49,29 +31,17 @@ in ''; }; - numDevices = mkOption { + swapDevices = lib.mkOption { default = 1; - type = types.int; + type = lib.types.int; description = lib.mdDoc '' - Number of zram devices to create. See also - `zramSwap.swapDevices` + Number of zram devices to be used as swap, recommended is 1. ''; }; - swapDevices = mkOption { - default = null; - example = 1; - type = with types; nullOr int; - description = lib.mdDoc '' - Number of zram devices to be used as swap. Must be - `<= zramSwap.numDevices`. - Default is same as `zramSwap.numDevices`, recommended is 1. - ''; - }; - - memoryPercent = mkOption { + memoryPercent = lib.mkOption { default = 50; - type = types.int; + type = lib.types.int; description = lib.mdDoc '' Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total @@ -80,9 +50,9 @@ in ''; }; - memoryMax = mkOption { + memoryMax = lib.mkOption { default = null; - type = with types; nullOr int; + type = with lib.types; nullOr int; description = lib.mdDoc '' Maximum total amount of memory (in bytes) that can be stored in the zram swap devices. @@ -90,9 +60,9 @@ in ''; }; - priority = mkOption { + priority = lib.mkOption { default = 5; - type = types.int; + type = lib.types.int; description = lib.mdDoc '' Priority of the zram swap devices. It should be a number higher than the priority of your disk-based swap devices (so that the system will @@ -100,10 +70,10 @@ in ''; }; - algorithm = mkOption { + algorithm = lib.mkOption { default = "zstd"; example = "lz4"; - type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; + type = with lib.types; either (enum [ "lzo" "lz4" "zstd" ]) str; description = lib.mdDoc '' Compression algorithm. `lzo` has good compression, but is slow. `lz4` has bad compression, but is fast. @@ -116,9 +86,7 @@ in }; - config = mkIf cfg.enable { - - inherit warnings; + config = lib.mkIf cfg.enable { system.requiredKernelConfig = with config.lib.kernelConfig; [ (isModule "ZRAM") @@ -128,78 +96,25 @@ in # once in stage 2 boot, and again when the zram-reloader service starts. # boot.kernelModules = [ "zram" ]; - boot.extraModprobeConfig = '' - options zram num_devices=${toString cfg.numDevices} - ''; + systemd.packages = [ pkgs.zram-generator ]; + systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap - boot.kernelParams = ["zram.num_devices=${toString cfg.numDevices}"]; - - services.udev.extraRules = '' - KERNEL=="zram[0-9]*", ENV{SYSTEMD_WANTS}="zram-init-%k.service", TAG+="systemd" - ''; - - systemd.services = - let - createZramInitService = dev: - nameValuePair "zram-init-${dev}" { - description = "Init swap on zram-based device ${dev}"; - after = [ "dev-${dev}.device" "zram-reloader.service" ]; - requires = [ "dev-${dev}.device" "zram-reloader.service" ]; - before = [ "dev-${dev}.swap" ]; - requiredBy = [ "dev-${dev}.swap" ]; - unitConfig.DefaultDependencies = false; # needed to prevent a cycle - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; - }; - script = '' - set -euo pipefail - - # Calculate memory to use for zram - mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / { - value=int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024); - ${lib.optionalString (cfg.memoryMax != null) '' - memory_max=int(${toString cfg.memoryMax}/${toString devicesCount}); - if (value > memory_max) { value = memory_max } - ''} - print value - }' /proc/meminfo) - - ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev} - ${pkgs.util-linux}/sbin/mkswap /dev/${dev} - ''; - restartIfChanged = false; - }; - in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader" - { - description = "Reload zram kernel module when number of devices changes"; - wants = [ "systemd-udevd.service" ]; - after = [ "systemd-udevd.service" ]; - unitConfig.DefaultDependencies = false; # needed to prevent a cycle - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStartPre = "-${modprobe} -r zram"; - ExecStart = "-${modprobe} zram"; - ExecStop = "-${modprobe} -r zram"; - }; - restartTriggers = [ - cfg.numDevices - cfg.algorithm - cfg.memoryPercent - ]; - restartIfChanged = true; - })]); - - swapDevices = - let - useZramSwap = dev: - { - device = "/dev/${dev}"; - priority = cfg.priority; - }; - in map useZramSwap devices; + environment.etc."systemd/zram-generator.conf".source = + (pkgs.formats.ini { }).generate "zram-generator.conf" (lib.listToAttrs + (builtins.map + (dev: { + name = dev; + value = + let + size = "${toString cfg.memoryPercent} / 100 * ram"; + in + { + zram-size = if cfg.memoryMax != null then "min(${size}, ${toString cfg.memoryMax} / 1024 / 1024)" else size; + compression-algorithm = cfg.algorithm; + swap-priority = cfg.priority; + }; + }) + devices)); }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index cee230ac41..2eff322d96 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -21,7 +21,8 @@ let pCfg = cfg.prime; syncCfg = pCfg.sync; offloadCfg = pCfg.offload; - primeEnabled = syncCfg.enable || offloadCfg.enable; + reverseSyncCfg = pCfg.reverseSync; + primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable; nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; nvidiaSettings = cfg.nvidiaSettings; busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; @@ -31,7 +32,8 @@ in imports = [ (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ]) - (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "allowExternalGpu" ]) (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "nvidiaBusId" ]) (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "intelBusId" ]) ]; @@ -104,16 +106,17 @@ in description = lib.mdDoc '' Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME. If enabled, the NVIDIA GPU will be always on and used for all rendering, - while enabling output to displays attached only to the integrated Intel GPU - without a multiplexer. + while enabling output to displays attached only to the integrated Intel/AMD + GPU without a multiplexer. Note that this option only has any effect if the "nvidia" driver is specified in {option}`services.xserver.videoDrivers`, and it should preferably be the only driver there. - If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified ({option}`hardware.nvidia.prime.nvidiaBusId` and - {option}`hardware.nvidia.prime.intelBusId`). + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). If you enable this, you may want to also enable kernel modesetting for the NVIDIA driver ({option}`hardware.nvidia.modesetting.enable`) in order @@ -125,11 +128,11 @@ in ''; }; - hardware.nvidia.prime.sync.allowExternalGpu = mkOption { + hardware.nvidia.prime.allowExternalGpu = mkOption { type = types.bool; default = false; description = lib.mdDoc '' - Configure X to allow external NVIDIA GPUs when using optimus. + Configure X to allow external NVIDIA GPUs when using Prime [Reverse] sync optimus. ''; }; @@ -139,9 +142,54 @@ in description = lib.mdDoc '' Enable render offload support using the NVIDIA proprietary driver via PRIME. - If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified ({option}`hardware.nvidia.prime.nvidiaBusId` and - {option}`hardware.nvidia.prime.intelBusId`). + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). + ''; + }; + + hardware.nvidia.prime.offload.enableOffloadCmd = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Adds a `nvidia-offload` convenience script to {option}`environment.systemPackages` + for offloading programs to an nvidia device. To work, should have also enabled + {option}`hardware.nvidia.prime.offload.enable` or {option}`hardware.nvidia.prime.reverseSync.enable`. + + Example usage `nvidia-offload sauerbraten_client`. + ''; + }; + + hardware.nvidia.prime.reverseSync.enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Warning: This feature is relatively new, depending on your system this might + work poorly. AMD support, especially so. + See: https://forums.developer.nvidia.com/t/the-all-new-outputsink-feature-aka-reverse-prime/129828 + + Enable NVIDIA Optimus support using the NVIDIA proprietary driver via reverse + PRIME. If enabled, the Intel/AMD GPU will be used for all rendering, while + enabling output to displays attached only to the NVIDIA GPU without a + multiplexer. + + Note that this option only has any effect if the "nvidia" driver is specified + in {option}`services.xserver.videoDrivers`, and it should preferably + be the only driver there. + + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). + + If you enable this, you may want to also enable kernel modesetting for the + NVIDIA driver ({option}`hardware.nvidia.modesetting.enable`) in order + to prevent tearing. + + Note that this configuration will only be successful when a display manager + for which the {option}`services.xserver.displayManager.setupCommands` + option is supported is used. ''; }; @@ -205,6 +253,13 @@ in ''; } + { + assertion = offloadCfg.enableOffloadCmd -> offloadCfg.enable || reverseSyncCfg.enable; + message = '' + Offload command requires offloading or reverse prime sync to be enabled. + ''; + } + { assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != ""); message = '' @@ -217,9 +272,19 @@ in message = "NVIDIA PRIME render offload is currently only supported on versions >= 435.21."; } + { + assertion = (reverseSyncCfg.enable && pCfg.amdgpuBusId != "") -> versionAtLeast nvidia_x11.version "470.0"; + message = "NVIDIA PRIME render offload for AMD APUs is currently only supported on versions >= 470 beta."; + } + { assertion = !(syncCfg.enable && offloadCfg.enable); - message = "Only one NVIDIA PRIME solution may be used at a time."; + message = "PRIME Sync and Offload cannot be both enabled"; + } + + { + assertion = !(syncCfg.enable && reverseSyncCfg.enable); + message = "PRIME Sync and PRIME Reverse Sync cannot be both enabled"; } { @@ -257,8 +322,10 @@ in # - Configure the display manager to run specific `xrandr` commands which will # configure/enable displays connected to the Intel iGPU / AMD APU. - services.xserver.drivers = let - in optional primeEnabled { + # reverse sync implies offloading + hardware.nvidia.prime.offload.enable = mkDefault reverseSyncCfg.enable; + + services.xserver.drivers = optional primeEnabled { name = igpuDriver; display = offloadCfg.enable; modules = optionals (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; @@ -273,7 +340,7 @@ in deviceSection = optionalString primeEnabled '' BusID "${pCfg.nvidiaBusId}" - ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} + ${optionalString pCfg.allowExternalGpu "Option \"AllowExternalGpus\""} ''; screenSection = '' @@ -290,19 +357,22 @@ in services.xserver.serverLayoutSection = optionalString syncCfg.enable '' Inactive "Device-${igpuDriver}[0]" + '' + optionalString reverseSyncCfg.enable '' + Inactive "Device-nvidia[0]" '' + optionalString offloadCfg.enable '' Option "AllowNVIDIAGPUScreens" ''; services.xserver.displayManager.setupCommands = let - sinkGpuProviderName = if igpuDriver == "amdgpu" then + gpuProviderName = if igpuDriver == "amdgpu" then # find the name of the provider if amdgpu "`${pkgs.xorg.xrandr}/bin/xrandr --listproviders | ${pkgs.gnugrep}/bin/grep -i AMD | ${pkgs.gnused}/bin/sed -n 's/^.*name://p'`" else igpuDriver; - in optionalString syncCfg.enable '' + providerCmdParams = if syncCfg.enable then "\"${gpuProviderName}\" NVIDIA-0" else "NVIDIA-G0 \"${gpuProviderName}\""; + in optionalString (syncCfg.enable || reverseSyncCfg.enable) '' # Added by nvidia configuration module for Optimus/PRIME. - ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource "${sinkGpuProviderName}" NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${providerCmdParams} ${pkgs.xorg.xrandr}/bin/xrandr --auto ''; @@ -325,7 +395,16 @@ in environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] - ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; + ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ] + ++ optionals offloadCfg.enableOffloadCmd [ + (pkgs.writeShellScriptBin "nvidia-offload" '' + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + '') + ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index caf97f66ef..d1b16d042d 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -217,7 +217,7 @@ in # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It’s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 17ea04cb4e..a434932497 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -510,6 +510,7 @@ in #seeks = 148; # removed 2020-06-21 prosody = 149; i2pd = 150; + systemd-coredump = 151; systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; diff --git a/third_party/nixpkgs/nixos/modules/misc/version.nix b/third_party/nixpkgs/nixos/modules/misc/version.nix index 30d11913c5..447f819385 100644 --- a/third_party/nixpkgs/nixos/modules/misc/version.nix +++ b/third_party/nixpkgs/nixos/modules/misc/version.nix @@ -130,7 +130,7 @@ in to be compatible. The effect is that NixOS will use defaults corresponding to the specified release (such as using an older version of PostgreSQL). - It‘s perfectly fine and recommended to leave this value at the + It’s perfectly fine and recommended to leave this value at the release version of the first install of this system. Changing this option will not upgrade your system. In fact it is meant to stay constant exactly when you upgrade your system. diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 82eec40ecf..7a818f11ee 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -195,6 +195,7 @@ ./programs/mdevctl.nix ./programs/mepo.nix ./programs/mininet.nix + ./programs/miriway.nix ./programs/mosh.nix ./programs/msmtp.nix ./programs/mtr.nix @@ -222,6 +223,7 @@ ./programs/seahorse.nix ./programs/sedutil.nix ./programs/shadow.nix + ./programs/sharing.nix ./programs/singularity.nix ./programs/skim.nix ./programs/slock.nix @@ -696,6 +698,7 @@ ./services/monitoring/arbtt.nix ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix + ./services/monitoring/cockpit.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/datadog-agent.nix @@ -1364,6 +1367,7 @@ ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix + ./virtualisation/multipass.nix ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix ./virtualisation/openstack-options.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/k3b.nix b/third_party/nixpkgs/nixos/modules/programs/k3b.nix index cdaed3cf70..5d19e4f1cc 100644 --- a/third_party/nixpkgs/nixos/modules/programs/k3b.nix +++ b/third_party/nixpkgs/nixos/modules/programs/k3b.nix @@ -28,7 +28,7 @@ with lib; k3b dvdplusrwtools cdrdao - cdrkit + cdrtools ]; security.wrappers = { @@ -44,7 +44,7 @@ with lib; owner = "root"; group = "cdrom"; permissions = "u+wrx,g+x"; - source = "${pkgs.cdrkit}/bin/cdrecord"; + source = "${pkgs.cdrtools}/bin/cdrecord"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/miriway.nix b/third_party/nixpkgs/nixos/modules/programs/miriway.nix new file mode 100644 index 0000000000..52b5f84762 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/miriway.nix @@ -0,0 +1,60 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.programs.miriway; +in { + options.programs.miriway = { + enable = lib.mkEnableOption (lib.mdDoc '' + Miriway, a Mir based Wayland compositor. You can manually launch Miriway by + executing "exec miriway" on a TTY, or launch it from a display manager. Copy + /etc/xdg/xdg-miriway/miriway-shell.config to ~/.config/miriway-shell.config + to modify the default configuration. See , + and "miriway --help" for more information''); + + config = lib.mkOption { + type = lib.types.lines; + default = '' + x11-window-title=Miriway (Mir-on-X) + idle-timeout=600 + ctrl-alt=t:miriway-terminal # Default "terminal emulator finder" + + shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + ''; + example = '' + idle-timeout=300 + ctrl-alt=t:weston-terminal + add-wayland-extensions=all + + shell-components=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + + shell-component=waybar + shell-component=wbg Pictures/wallpaper + + shell-meta=a:synapse + ''; + description = lib.mdDoc '' + Miriway's config. This will be installed system-wide. + The default will install the miriway package's barebones example config. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment = { + systemPackages = [ pkgs.miriway ]; + etc = { + "xdg/xdg-miriway/miriway-shell.config".text = cfg.config; + }; + }; + + hardware.opengl.enable = lib.mkDefault true; + fonts.enableDefaultFonts = lib.mkDefault true; + programs.dconf.enable = lib.mkDefault true; + programs.xwayland.enable = lib.mkDefault true; + + # To make the Miriway session available if a display manager like SDDM is enabled: + services.xserver.displayManager.sessionPackages = [ pkgs.miriway ]; + }; + + meta.maintainers = with lib.maintainers; [ OPNA2608 ]; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix index 0771f03c77..a52783aa66 100644 --- a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix +++ b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix @@ -86,7 +86,7 @@ in { description = lib.mdDoc "Proxy DNS requests - no leak for DNS data."; }; - quietMode = mkEnableOption (lib.mdDoc "Quiet mode (no output from the library)."); + quietMode = mkEnableOption (lib.mdDoc "Quiet mode (no output from the library)"); remoteDNSSubnet = mkOption { type = types.enum [ 10 127 224 ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/qdmr.nix b/third_party/nixpkgs/nixos/modules/programs/qdmr.nix index c0b1984eff..1bb81317bd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/qdmr.nix +++ b/third_party/nixpkgs/nixos/modules/programs/qdmr.nix @@ -20,6 +20,6 @@ in { config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; - users.groups.wireshark = {}; + users.groups.dialout = {}; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/sharing.nix b/third_party/nixpkgs/nixos/modules/programs/sharing.nix new file mode 100644 index 0000000000..9ab51859dc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/sharing.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: +with lib; +{ + options.programs.sharing = { + enable = mkEnableOption (lib.mdDoc '' + sharing, a CLI tool for sharing files. + + Note that it will opens the 7478 port for TCP in the firewall, which is needed for it to function properly + ''); + }; + config = + let + cfg = config.programs.sharing; + in + mkIf cfg.enable { + environment.systemPackages = [ pkgs.sharing ]; + networking.firewall.allowedTCPPorts = [ 7478 ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/singularity.nix b/third_party/nixpkgs/nixos/modules/programs/singularity.nix index 9648d0c278..4884e5bdf2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/singularity.nix +++ b/third_party/nixpkgs/nixos/modules/programs/singularity.nix @@ -3,32 +3,90 @@ with lib; let cfg = config.programs.singularity; - singularity = pkgs.singularity.overrideAttrs (attrs : { - installPhase = attrs.installPhase + '' - mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig - ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid - ''; - }); -in { +in +{ + options.programs.singularity = { - enable = mkEnableOption (lib.mdDoc "Singularity"); + enable = mkEnableOption (mdDoc "singularity") // { + description = mdDoc '' + Whether to install Singularity/Apptainer with system-level overriding such as SUID support. + ''; + }; + package = mkOption { + type = types.package; + default = pkgs.singularity; + defaultText = literalExpression "pkgs.singularity"; + example = literalExpression "pkgs.apptainer"; + description = mdDoc '' + Singularity/Apptainer package to override and install. + ''; + }; + packageOverriden = mkOption { + type = types.nullOr types.package; + default = null; + description = mdDoc '' + This option provides access to the overriden result of `programs.singularity.package`. + + For example, the following configuration makes all the Nixpkgs packages use the overriden `singularity`: + ```Nix + { config, lib, pkgs, ... }: + { + nixpkgs.overlays = [ + (final: prev: { + _singularity-orig = prev.singularity; + singularity = config.programs.singularity.packageOverriden; + }) + ]; + programs.singularity.enable = true; + programs.singularity.package = pkgs._singularity-orig; + } + ``` + + Use `lib.mkForce` to forcefully specify the overriden package. + ''; + }; + enableFakeroot = mkOption { + type = types.bool; + default = true; + example = false; + description = mdDoc '' + Whether to enable the `--fakeroot` support of Singularity/Apptainer. + ''; + }; + enableSuid = mkOption { + type = types.bool; + default = true; + example = false; + description = mdDoc '' + Whether to enable the SUID support of Singularity/Apptainer. + ''; + }; }; config = mkIf cfg.enable { - environment.systemPackages = [ singularity ]; - security.wrappers.singularity-suid = - { setuid = true; - owner = "root"; - group = "root"; - source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; - }; - systemd.tmpfiles.rules = [ - "d /var/singularity/mnt/session 0770 root root -" - "d /var/singularity/mnt/final 0770 root root -" - "d /var/singularity/mnt/overlay 0770 root root -" - "d /var/singularity/mnt/container 0770 root root -" - "d /var/singularity/mnt/source 0770 root root -" - ]; + programs.singularity.packageOverriden = (cfg.package.override ( + optionalAttrs cfg.enableFakeroot { + newuidmapPath = "/run/wrappers/bin/newuidmap"; + newgidmapPath = "/run/wrappers/bin/newgidmap"; + } // optionalAttrs cfg.enableSuid { + enableSuid = true; + starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid"; + } + )); + environment.systemPackages = [ cfg.packageOverriden ]; + security.wrappers."${cfg.packageOverriden.projectName}-suid" = mkIf cfg.enableSuid { + setuid = true; + owner = "root"; + group = "root"; + source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig"; + }; + systemd.tmpfiles.rules = [ + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/final 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/overlay 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/container 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/source 0770 root root -" + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix index 36b724e04b..3b8da78e2a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix @@ -282,7 +282,7 @@ in config = { programs.ssh.setXAuthLocation = - mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11); + mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.settings.X11Forwarding); assertions = [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix index b0a766dd05..3b2e69bd37 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix @@ -26,7 +26,7 @@ let }; }; - swayPackage = pkgs.sway.override { + defaultSwayPackage = pkgs.sway.override { extraSessionCommands = cfg.extraSessionCommands; extraOptions = cfg.extraOptions; withBaseWrapper = cfg.wrapperFeatures.base; @@ -42,6 +42,19 @@ in { and "man 5 sway" for more information''); + package = mkOption { + type = with types; nullOr package; + default = defaultSwayPackage; + defaultText = literalExpression "pkgs.sway"; + description = lib.mdDoc '' + Sway package to use. Will override the options + 'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'. + Set to null to not add any Sway package to your + path. This should be done if you want to use the Home Manager Sway + module to install Sway. + ''; + }; + wrapperFeatures = mkOption { type = wrapperOptions; default = { }; @@ -121,16 +134,17 @@ in { } ]; environment = { - systemPackages = [ swayPackage ] ++ cfg.extraPackages; + systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; # Needed for the default wallpaper: - pathsToLink = [ "/share/backgrounds/sway" ]; + pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ]; etc = { - "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config"; "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' # Import the most important environment variables into the D-Bus and systemd # user environments (e.g. required for screen sharing and Pinentry prompts): exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP ''; + } // optionalAttrs (cfg.package != null) { + "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; security.polkit.enable = true; @@ -139,7 +153,7 @@ in { fonts.enableDefaultFonts = mkDefault true; programs.dconf.enable = mkDefault true; # To make a Sway session available if a display manager like SDDM is enabled: - services.xserver.displayManager.sessionPackages = [ swayPackage ]; + services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; programs.xwayland.enable = mkDefault true; # For screen sharing (this option only has an effect with xdg.portal.enable): xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; diff --git a/third_party/nixpkgs/nixos/modules/security/polkit.nix b/third_party/nixpkgs/nixos/modules/security/polkit.nix index f33898578b..de427ccb29 100644 --- a/third_party/nixpkgs/nixos/modules/security/polkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/polkit.nix @@ -14,7 +14,7 @@ in security.polkit.enable = mkEnableOption (lib.mdDoc "polkit"); - security.polkit.debug = mkEnableOption (lib.mdDoc "debug logs from polkit. This is required in order to see log messages from rule definitions."); + security.polkit.debug = mkEnableOption (lib.mdDoc "debug logs from polkit. This is required in order to see log messages from rule definitions"); security.polkit.extraConfig = mkOption { type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix b/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix index ce914003c6..8e7059e5b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix @@ -9,7 +9,7 @@ let in { options = { services.zfs.autoReplication = { - enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication."); + enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication"); followDelete = mkOption { description = lib.mdDoc "Remove remote snapshots that don't have a local correspondent."; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 7aa2a8323b..dc851688fb 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -62,7 +62,7 @@ in ''; }; - enable = mkEnableOption (lib.mdDoc "Kubernetes addon manager."); + enable = mkEnableOption (lib.mdDoc "Kubernetes addon manager"); }; ###### implementation diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 3ede1cb80e..8e935d621b 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -146,7 +146,7 @@ in default = "unix:///run/containerd/containerd.sock"; }; - enable = mkEnableOption (lib.mdDoc "Kubernetes kubelet."); + enable = mkEnableOption (lib.mdDoc "Kubernetes kubelet"); extraOpts = mkOption { description = lib.mdDoc "Kubernetes kubelet extra command line options."; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix index 0c80e79d4b..344c43a429 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix @@ -383,7 +383,7 @@ in "d /var/spool/slurmd 755 root root -" ]; - services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true); + services.openssh.settings.X11Forwarding = mkIf cfg.client.enable (mkDefault true); systemd.services.slurmctld = mkIf (cfg.server.enable) { path = with pkgs; [ wrappedSlurm munge coreutils ] diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 0006ba1a7b..a8db7dce8f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -27,7 +27,7 @@ with lib; options = { services.gnome.evolution-data-server = { - enable = mkEnableOption (lib.mdDoc "Evolution Data Server, a collection of services for storing addressbooks and calendars."); + enable = mkEnableOption (lib.mdDoc "Evolution Data Server, a collection of services for storing addressbooks and calendars"); plugins = mkOption { type = types.listOf types.package; default = [ ]; @@ -35,7 +35,7 @@ with lib; }; }; programs.evolution = { - enable = mkEnableOption (lib.mdDoc "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality."); + enable = mkEnableOption (lib.mdDoc "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality"); plugins = mkOption { type = types.listOf types.package; default = [ ]; diff --git a/third_party/nixpkgs/nixos/modules/services/development/zammad.nix b/third_party/nixpkgs/nixos/modules/services/development/zammad.nix index 7de11b08b7..0faeb4c0e9 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/zammad.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/zammad.nix @@ -28,7 +28,7 @@ in options = { services.zammad = { - enable = mkEnableOption (lib.mdDoc "Zammad, a web-based, open source user support/ticketing solution."); + enable = mkEnableOption (lib.mdDoc "Zammad, a web-based, open source user support/ticketing solution"); package = mkOption { type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix b/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix index 8b340bb161..f33ea5c08a 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix @@ -54,7 +54,7 @@ in default = 0; description = lib.mdDoc "Set debug log level."; }; - options.exit-on-end = mkEnableOption (lib.mdDoc "exit instead of restarting when a game ends."); + options.exit-on-end = mkEnableOption (lib.mdDoc "exit instead of restarting when a game ends"); options.Guests = mkEnableOption (lib.mdDoc "guests to login if auth is enabled"); options.Newusers = mkEnableOption (lib.mdDoc "new users to login if auth is enabled"); options.port = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix index 7368845daf..d5c71bb821 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix @@ -19,7 +19,7 @@ in services.udisks2 = { - enable = mkEnableOption (lib.mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices."); + enable = mkEnableOption (lib.mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices"); settings = mkOption rec { type = types.attrsOf settingsFormat.type; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index f6a167572f..21bafd859c 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -171,11 +171,11 @@ in options.services.dovecot2 = { enable = mkEnableOption (lib.mdDoc "the dovecot 2.x POP3/IMAP server"); - enablePop3 = mkEnableOption (lib.mdDoc "starting the POP3 listener (when Dovecot is enabled)."); + enablePop3 = mkEnableOption (lib.mdDoc "starting the POP3 listener (when Dovecot is enabled)"); - enableImap = mkEnableOption (lib.mdDoc "starting the IMAP listener (when Dovecot is enabled).") // { default = true; }; + enableImap = mkEnableOption (lib.mdDoc "starting the IMAP listener (when Dovecot is enabled)") // { default = true; }; - enableLmtp = mkEnableOption (lib.mdDoc "starting the LMTP listener (when Dovecot is enabled)."); + enableLmtp = mkEnableOption (lib.mdDoc "starting the LMTP listener (when Dovecot is enabled)"); protocols = mkOption { type = types.listOf types.str; @@ -300,9 +300,9 @@ in description = lib.mdDoc "Path to the server's private key."; }; - enablePAM = mkEnableOption (lib.mdDoc "creating a own Dovecot PAM service and configure PAM user logins.") // { default = true; }; + enablePAM = mkEnableOption (lib.mdDoc "creating a own Dovecot PAM service and configure PAM user logins") // { default = true; }; - enableDHE = mkEnableOption (lib.mdDoc "enable ssl_dh and generation of primes for the key exchange.") // { default = true; }; + enableDHE = mkEnableOption (lib.mdDoc "enable ssl_dh and generation of primes for the key exchange") // { default = true; }; sieveScripts = mkOption { type = types.attrsOf types.path; @@ -310,7 +310,7 @@ in description = lib.mdDoc "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc."; }; - showPAMFailure = mkEnableOption (lib.mdDoc "showing the PAM failure message on authentication error (useful for OTPW)."); + showPAMFailure = mkEnableOption (lib.mdDoc "showing the PAM failure message on authentication error (useful for OTPW)"); mailboxes = mkOption { type = with types; coercedTo @@ -326,7 +326,7 @@ in description = lib.mdDoc "Configure mailboxes and auto create or subscribe them."; }; - enableQuota = mkEnableOption (lib.mdDoc "the dovecot quota service."); + enableQuota = mkEnableOption (lib.mdDoc "the dovecot quota service"); quotaPort = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index e05820fb87..95dc2f6aa2 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -150,9 +150,13 @@ in root = cfg.package; index = "index.php"; extraConfig = '' - location ~* \.php$ { + location ~* \.php(/|$) { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${fpm.socket}; + + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix index c94852e3aa..508e2862b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix @@ -8,7 +8,7 @@ in { options = { services.atuin = { - enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin."); + enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin"); openRegistration = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix b/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix index 6353966f5c..3f6d97f857 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix @@ -6,7 +6,7 @@ let cfg = config.services.input-remapper; in { options = { services.input-remapper = { - enable = mkEnableOption (lib.mdDoc "input-remapper, an easy to use tool to change the mapping of your input device buttons."); + enable = mkEnableOption (lib.mdDoc "input-remapper, an easy to use tool to change the mapping of your input device buttons"); package = mkPackageOptionMD pkgs "input-remapper" { }; enableUdevRules = mkEnableOption (lib.mdDoc "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140"); serviceWantedBy = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix b/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix index 314388e015..be3accc0d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix @@ -85,7 +85,7 @@ in WorkingDirectory = libDir; SyslogIdentifier = "pykms"; Restart = "on-failure"; - MemoryLimit = cfg.memoryLimit; + MemoryMax = cfg.memoryLimit; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix index b2cadbf0c4..d4391bc49e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix @@ -438,7 +438,7 @@ in }; options."lists.sr.ht" = commonServiceSettings "lists" // { - allow-new-lists = mkEnableOption (lib.mdDoc "Allow creation of new lists."); + allow-new-lists = mkEnableOption (lib.mdDoc "Allow creation of new lists"); notify-from = mkOption { description = lib.mdDoc "Outgoing email for notifications generated by users."; type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix index a8fba4e6e8..68e6e8e40b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix @@ -123,7 +123,7 @@ in { ${escapeShellArgs cfg.extraOptions} \ ${optionalString (cfg.storageDriver != null) '' -storage_driver "${cfg.storageDriver}" \ - -storage_driver_user "${cfg.storageDriverHost}" \ + -storage_driver_host "${cfg.storageDriverHost}" \ -storage_driver_db "${cfg.storageDriverDb}" \ -storage_driver_user "${cfg.storageDriverUser}" \ -storage_driver_password "$(cat "${cfg.storageDriverPasswordFile}")" \ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/cockpit.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/cockpit.nix new file mode 100644 index 0000000000..2947b4d801 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/cockpit.nix @@ -0,0 +1,231 @@ +{ pkgs, config, lib, ... }: + +let + cfg = config.services.cockpit; + inherit (lib) types mkEnableOption mkOption mkIf mdDoc literalMD mkPackageOptionMD; + settingsFormat = pkgs.formats.ini {}; +in { + options = { + services.cockpit = { + enable = mkEnableOption (mdDoc "Cockpit"); + + package = mkPackageOptionMD pkgs "Cockpit" { + default = [ "cockpit" ]; + }; + + settings = lib.mkOption { + type = settingsFormat.type; + + default = {}; + + description = mdDoc '' + Settings for cockpit that will be saved in /etc/cockpit/cockpit.conf. + + See the [documentation](https://cockpit-project.org/guide/latest/cockpit.conf.5.html), that is also available with `man cockpit.conf.5` for details. + ''; + }; + + port = mkOption { + description = mdDoc "Port where cockpit will listen."; + type = types.port; + default = 9090; + }; + + openFirewall = mkOption { + description = mdDoc "Open port for cockpit."; + type = types.bool; + default = false; + }; + }; + }; + config = mkIf cfg.enable { + + # expose cockpit-bridge system-wide + environment.systemPackages = [ cfg.package ]; + + # allow cockpit to find its plugins + environment.pathsToLink = [ "/share/cockpit" ]; + + # generate cockpit settings + environment.etc."cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings; + + security.pam.services.cockpit = {}; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + # units are in reverse sort order if you ls $out/lib/systemd/system + # all these units are basically verbatim translated from upstream + + # Translation from $out/lib/systemd/system/systemd-cockpithttps.slice + systemd.slices.system-cockpithttps = { + description = "Resource limits for all cockpit-ws-https@.service instances"; + sliceConfig = { + TasksMax = 200; + MemoryHigh = "75%"; + MemoryMax = "90%"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https@.socket + systemd.sockets."cockpit-wsinstance-https@" = { + unitConfig = { + Description = "Socket for Cockpit Web Service https instance %I"; + BindsTo = [ "cockpit.service" "cockpit-wsinstance-https@%i.service" ]; + # clean up the socket after the service exits, to prevent fd leak + # this also effectively prevents a DoS by starting arbitrarily many sockets, as + # the services are resource-limited by system-cockpithttps.slice + Documentation = "man:cockpit-ws(8)"; + }; + socketConfig = { + ListenStream = "/run/cockpit/wsinstance/https@%i.sock"; + SocketUser = "root"; + SocketMode = "0600"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https@.service + systemd.services."cockpit-wsinstance-https@" = { + description = "Cockpit Web Service https instance %I"; + bindsTo = [ "cockpit.service"]; + path = [ cfg.package ]; + documentation = [ "man:cockpit-ws(8)" ]; + serviceConfig = { + Slice = "system-cockpithttps.slice"; + ExecStart = "${cfg.package}/libexec/cockpit-ws --for-tls-proxy --port=0"; + User = "root"; + Group = ""; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-http.socket + systemd.sockets.cockpit-wsinstance-http = { + unitConfig = { + Description = "Socket for Cockpit Web Service http instance"; + BindsTo = "cockpit.service"; + Documentation = "man:cockpit-ws(8)"; + }; + socketConfig = { + ListenStream = "/run/cockpit/wsinstance/http.sock"; + SocketUser = "root"; + SocketMode = "0600"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https-factory.socket + systemd.sockets.cockpit-wsinstance-https-factory = { + unitConfig = { + Description = "Socket for Cockpit Web Service https instance factory"; + BindsTo = "cockpit.service"; + Documentation = "man:cockpit-ws(8)"; + }; + socketConfig = { + ListenStream = "/run/cockpit/wsinstance/https-factory.sock"; + Accept = true; + SocketUser = "root"; + SocketMode = "0600"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https-factory@.service + systemd.services."cockpit-wsinstance-https-factory@" = { + description = "Cockpit Web Service https instance factory"; + documentation = [ "man:cockpit-ws(8)" ]; + path = [ cfg.package ]; + serviceConfig = { + ExecStart = "${cfg.package}/libexec/cockpit-wsinstance-factory"; + User = "root"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-http.service + systemd.services."cockpit-wsinstance-http" = { + description = "Cockpit Web Service http instance"; + bindsTo = [ "cockpit.service" ]; + path = [ cfg.package ]; + documentation = [ "man:cockpit-ws(8)" ]; + serviceConfig = { + ExecStart = "${cfg.package}/libexec/cockpit-ws --no-tls --port=0"; + User = "root"; + Group = ""; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit.socket + systemd.sockets."cockpit" = { + unitConfig = { + Description = "Cockpit Web Service Socket"; + Documentation = "man:cockpit-ws(8)"; + Wants = "cockpit-motd.service"; + }; + socketConfig = { + ListenStream = cfg.port; + ExecStartPost = [ + "-${cfg.package}/share/cockpit/motd/update-motd \"\" localhost" + "-${pkgs.coreutils}/bin/ln -snf active.motd /run/cockpit/motd" + ]; + ExecStopPost = "-${pkgs.coreutils}/bin/ln -snf inactive.motd /run/cockpit/motd"; + }; + wantedBy = [ "sockets.target" ]; + }; + + # Translation from $out/lib/systemd/system/cockpit.service + systemd.services."cockpit" = { + description = "Cockpit Web Service"; + documentation = [ "man:cockpit-ws(8)" ]; + restartIfChanged = true; + path = with pkgs; [ coreutils cfg.package ]; + requires = [ "cockpit.socket" "cockpit-wsinstance-http.socket" "cockpit-wsinstance-https-factory.socket" ]; + after = [ "cockpit-wsinstance-http.socket" "cockpit-wsinstance-https-factory.socket" ]; + environment = { + G_MESSAGES_DEBUG = "cockpit-ws,cockpit-bridge"; + }; + serviceConfig = { + RuntimeDirectory="cockpit/tls"; + ExecStartPre = [ + # cockpit-tls runs in a more constrained environment, these + means that these commands + # will run with full privilege instead of inside that constrained environment + # See https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= for details + "+${cfg.package}/libexec/cockpit-certificate-ensure --for-cockpit-tls" + ]; + ExecStart = "${cfg.package}/libexec/cockpit-tls"; + User = "root"; + Group = ""; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + MemoryDenyWriteExecute = true; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-motd.service + # This part basically implements a motd state machine: + # - If cockpit.socket is enabled then /run/cockpit/motd points to /run/cockpit/active.motd + # - If cockpit.socket is disabled then /run/cockpit/motd points to /run/cockpit/inactive.motd + # - As cockpit.socket is disabled by default, /run/cockpit/motd points to /run/cockpit/inactive.motd + # /run/cockpit/active.motd is generated dynamically by cockpit-motd.service + systemd.services."cockpit-motd" = { + path = with pkgs; [ nettools ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${cfg.package}/share/cockpit/motd/update-motd"; + }; + description = "Cockpit motd updater service"; + documentation = [ "man:cockpit-ws(8)" ]; + wants = [ "network.target" ]; + after = [ "network.target" "cockpit.socket" ]; + }; + + systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf + "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd" + "f /run/cockpit/active.motd 0640 root root -" + "L+ /run/cockpit/motd - - - - inactive.motd" + "d /etc/cockpit/ws-certs.d 0600 root root 0" + ]; + }; + + meta.maintainers = pkgs.cockpit.meta.maintainers; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix index 4185cd76c4..67dc1bc19e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix @@ -11,7 +11,7 @@ in { # the upstream package runs as root, but doesn't seem to be strictly # necessary for basic functionality - runAsRoot = mkEnableOption (lib.mdDoc "Whether to run as root."); + runAsRoot = mkEnableOption (lib.mdDoc "Whether to run as root"); autoRetirement = mkEnableOption (lib.mdDoc '' Whether to automatically retire the host upon OS shutdown. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix index 537d72e85c..6f403b3e58 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix @@ -6,6 +6,11 @@ let cfg = config.services.prometheus.exporters.pihole; in { + imports = [ + (mkRemovedOptionModule [ "interval"] "This option has been removed.") + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; + port = 9617; extraOpts = { apiToken = mkOption { @@ -13,15 +18,7 @@ in default = ""; example = "580a770cb40511eb85290242ac130003580a770cb40511eb85290242ac130003"; description = lib.mdDoc '' - pi-hole API token which can be used instead of a password - ''; - }; - interval = mkOption { - type = types.str; - default = "10s"; - example = "30s"; - description = lib.mdDoc '' - How often to scrape new data + Pi-Hole API token which can be used instead of a password ''; }; password = mkOption { @@ -29,7 +26,7 @@ in default = ""; example = "password"; description = lib.mdDoc '' - The password to login into pihole. An api token can be used instead. + The password to login into Pi-Hole. An api token can be used instead. ''; }; piholeHostname = mkOption { @@ -37,7 +34,7 @@ in default = "pihole"; example = "127.0.0.1"; description = lib.mdDoc '' - Hostname or address where to find the pihole webinterface + Hostname or address where to find the Pi-Hole webinterface ''; }; piholePort = mkOption { @@ -45,7 +42,7 @@ in default = 80; example = 443; description = lib.mdDoc '' - The port pihole webinterface is reachable on + The port Pi-Hole webinterface is reachable on ''; }; protocol = mkOption { @@ -53,21 +50,28 @@ in default = "http"; example = "https"; description = lib.mdDoc '' - The protocol which is used to connect to pihole + The protocol which is used to connect to Pi-Hole + ''; + }; + timeout = mkOption { + type = types.str; + default = "5s"; + description = lib.mdDoc '' + Controls the timeout to connect to a Pi-Hole instance ''; }; }; serviceOpts = { serviceConfig = { ExecStart = '' - ${pkgs.bash}/bin/bash -c "${pkgs.prometheus-pihole-exporter}/bin/pihole-exporter \ - -interval ${cfg.interval} \ + ${pkgs.prometheus-pihole-exporter}/bin/pihole-exporter \ ${optionalString (cfg.apiToken != "") "-pihole_api_token ${cfg.apiToken}"} \ -pihole_hostname ${cfg.piholeHostname} \ ${optionalString (cfg.password != "") "-pihole_password ${cfg.password}"} \ -pihole_port ${toString cfg.piholePort} \ -pihole_protocol ${cfg.protocol} \ - -port ${toString cfg.port}" + -port ${toString cfg.port} \ + -timeout ${cfg.timeout} ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix index 5cd1e2c65e..3b7f978528 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix @@ -24,9 +24,9 @@ in { inherit (options.services.unpoller.unifi) controllers; inherit (options.services.unpoller) loki; log = { - debug = mkEnableOption (lib.mdDoc "debug logging including line numbers, high resolution timestamps, per-device logs."); - quiet = mkEnableOption (lib.mdDoc "startup and error logs only."); - prometheusErrors = mkEnableOption (lib.mdDoc "emitting errors to prometheus."); + debug = mkEnableOption (lib.mdDoc "debug logging including line numbers, high resolution timestamps, per-device logs"); + quiet = mkEnableOption (lib.mdDoc "startup and error logs only"); + prometheusErrors = mkEnableOption (lib.mdDoc "emitting errors to prometheus"); }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix index 886e14b5f6..5f803d57b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix @@ -11,7 +11,7 @@ in options = { services.uptime-kuma = { - enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set."); + enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set"); package = mkOption { type = types.package; @@ -20,7 +20,7 @@ in description = lib.mdDoc "Uptime Kuma package to use."; }; - appriseSupport = mkEnableOption (mdDoc "apprise support for notifications."); + appriseSupport = mkEnableOption (mdDoc "apprise support for notifications"); settings = lib.mkOption { type = lib.types.submodule { freeformType = with lib.types; attrsOf str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix index ab82a2a07d..49cbc89d5a 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix @@ -85,7 +85,7 @@ in { description = lib.mdDoc "Run daemons as user moosefs instead of root."; }; - client.enable = mkEnableOption (lib.mdDoc "Moosefs client."); + client.enable = mkEnableOption (lib.mdDoc "Moosefs client"); master = { enable = mkOption { @@ -131,7 +131,7 @@ in { }; metalogger = { - enable = mkEnableOption (lib.mdDoc "Moosefs metalogger daemon."); + enable = mkEnableOption (lib.mdDoc "Moosefs metalogger daemon"); settings = mkOption { type = types.submodule { @@ -149,7 +149,7 @@ in { }; chunkserver = { - enable = mkEnableOption (lib.mdDoc "Moosefs chunkserver daemon."); + enable = mkEnableOption (lib.mdDoc "Moosefs chunkserver daemon"); openFirewall = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix index ab784563e4..46b26195d2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix @@ -10,7 +10,7 @@ let options = { - enable = mkEnableOption (lib.mdDoc "blockbook-frontend application."); + enable = mkEnableOption (lib.mdDoc "blockbook-frontend application"); package = mkOption { type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix index a06b9573a8..42924d7f69 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix @@ -304,6 +304,10 @@ in forceSSL = cfg.singleNode.enableTLS; locations."/" = { proxyPass = "http://127.0.0.1:${toString cfg.settings.port}"; + # We need to pass the Host header that matches the original Host header. Otherwise, + # Hawk authentication will fail (because it assumes that the client and server see + # the same value of the Host header). + recommendedProxySettings = true; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix index 2bedafc5d9..e1a8c6740f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix @@ -68,6 +68,12 @@ in description = lib.mdDoc "Whether this node is a lighthouse."; }; + isRelay = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether this node is a relay."; + }; + lighthouses = mkOption { type = types.listOf types.str; default = []; @@ -78,6 +84,15 @@ in example = [ "192.168.100.1" ]; }; + relays = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + List of IPs of relays that this node should allow traffic from. + ''; + example = [ "192.168.100.1" ]; + }; + listen.host = mkOption { type = types.str; default = "0.0.0.0"; @@ -157,6 +172,11 @@ in am_lighthouse = netCfg.isLighthouse; hosts = netCfg.lighthouses; }; + relay = { + am_relay = netCfg.isRelay; + relays = netCfg.relays; + use_relays = true; + }; listen = { host = netCfg.listen.host; port = netCfg.listen.port; @@ -173,25 +193,41 @@ in configFile = format.generate "nebula-config-${netName}.yml" settings; in { - # Create systemd service for Nebula. + # Create the systemd service for Nebula. "nebula@${netName}" = { description = "Nebula VPN service for ${netName}"; wants = [ "basic.target" ]; after = [ "basic.target" "network.target" ]; before = [ "sshd.service" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = mkMerge [ - { - Type = "simple"; - Restart = "always"; - ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; - } - # The service needs to launch as root to access the tun device, if it's enabled. - (mkIf netCfg.tun.disable { - User = networkId; - Group = networkId; - }) - ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; + UMask = "0027"; + CapabilityBoundingSet = "CAP_NET_ADMIN"; + AmbientCapabilities = "CAP_NET_ADMIN"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = false; # needs access to /dev/net/tun (below) + DeviceAllow = "/dev/net/tun rw"; + DevicePolicy = "closed"; + PrivateTmp = true; + PrivateUsers = false; # CapabilityBoundingSet needs to apply to the host namespace + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + User = networkId; + Group = networkId; + }; unitConfig.StartLimitIntervalSec = 0; # ensure Restart=always is always honoured (networks can go down for arbitrarily long) }; }) enabledNetworks); @@ -202,7 +238,7 @@ in # Create the service users and groups. users.users = mkMerge (mapAttrsToList (netName: netCfg: - mkIf netCfg.tun.disable { + { ${nameToId netName} = { group = nameToId netName; description = "Nebula service user for network ${netName}"; @@ -210,9 +246,8 @@ in }; }) enabledNetworks); - users.groups = mkMerge (mapAttrsToList (netName: netCfg: - mkIf netCfg.tun.disable { - ${nameToId netName} = {}; - }) enabledNetworks); + users.groups = mkMerge (mapAttrsToList (netName: netCfg: { + ${nameToId netName} = {}; + }) enabledNetworks); }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix index 492a0936fd..78d312af97 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix @@ -57,7 +57,8 @@ let ''}"} ''; - in { + in + { description = "OpenVPN instance ‘${name}’"; wantedBy = optional cfg.autoStart "multi-user.target"; @@ -70,6 +71,16 @@ let serviceConfig.Type = "notify"; }; + restartService = optionalAttrs cfg.restartAfterSleep { + openvpn-restart = { + wantedBy = [ "sleep.target" ]; + path = [ pkgs.procps ]; + script = "pkill --signal SIGHUP --exact openvpn"; + #SIGHUP makes openvpn process to self-exit and then it got restarted by systemd because of Restart=always + description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep"; + }; + }; + in { @@ -82,7 +93,7 @@ in options = { services.openvpn.servers = mkOption { - default = {}; + default = { }; example = literalExpression '' { @@ -201,14 +212,21 @@ in }; + services.openvpn.restartAfterSleep = mkOption { + default = true; + type = types.bool; + description = lib.mdDoc "Whether OpenVPN client should be restarted after sleep."; + }; + }; ###### implementation - config = mkIf (cfg.servers != {}) { + config = mkIf (cfg.servers != { }) { - systemd.services = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers); + systemd.services = (listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers)) + // restartService; environment.systemPackages = [ openvpn ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/soju.nix b/third_party/nixpkgs/nixos/modules/services/networking/soju.nix index d4c4ca47bc..7f0ac3e3b8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/soju.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/soju.nix @@ -120,5 +120,5 @@ in }; }; - meta.maintainers = with maintainers; [ malvo ]; + meta.maintainers = with maintainers; [ malte-v ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index f2b8d12ccc..095c7de0b7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -13,11 +13,12 @@ let else pkgs.buildPackages.openssh; # reports boolean as yes / no - mkValueStringSshd = v: + mkValueStringSshd = with lib; v: if isInt v then toString v else if isString v then v else if true == v then "yes" else if false == v then "no" + else if isList v then concatStringsSep "," v else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; # dont use the "=" operator @@ -104,6 +105,11 @@ in (mkRenamedOptionModule [ "services" "openssh" "useDns" ] [ "services" "openssh" "settings" "UseDns" ]) (mkRenamedOptionModule [ "services" "openssh" "permitRootLogin" ] [ "services" "openssh" "settings" "PermitRootLogin" ]) (mkRenamedOptionModule [ "services" "openssh" "logLevel" ] [ "services" "openssh" "settings" "LogLevel" ]) + (mkRenamedOptionModule [ "services" "openssh" "macs" ] [ "services" "openssh" "settings" "Macs" ]) + (mkRenamedOptionModule [ "services" "openssh" "ciphers" ] [ "services" "openssh" "settings" "Ciphers" ]) + (mkRenamedOptionModule [ "services" "openssh" "kexAlgorithms" ] [ "services" "openssh" "settings" "KexAlgorithms" ]) + (mkRenamedOptionModule [ "services" "openssh" "gatewayPorts" ] [ "services" "openssh" "settings" "GatewayPorts" ]) + (mkRenamedOptionModule [ "services" "openssh" "forwardX11" ] [ "services" "openssh" "settings" "X11Forwarding" ]) ]; ###### interface @@ -131,14 +137,6 @@ in ''; }; - forwardX11 = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to allow X11 connections to be forwarded. - ''; - }; - allowSFTP = mkOption { type = types.bool; default = true; @@ -167,16 +165,6 @@ in ''; }; - gatewayPorts = mkOption { - type = types.str; - default = "no"; - description = lib.mdDoc '' - Specifies whether remote hosts are allowed to connect to - ports forwarded for the client. See - {manpage}`sshd_config(5)`. - ''; - }; - ports = mkOption { type = types.listOf types.port; default = [22]; @@ -286,63 +274,6 @@ in ''; }; - kexAlgorithms = mkOption { - type = types.listOf types.str; - default = [ - "sntrup761x25519-sha512@openssh.com" - "curve25519-sha256" - "curve25519-sha256@libssh.org" - "diffie-hellman-group-exchange-sha256" - ]; - description = lib.mdDoc '' - Allowed key exchange algorithms - - Uses the lower bound recommended in both - - and - - ''; - }; - - ciphers = mkOption { - type = types.listOf types.str; - default = [ - "chacha20-poly1305@openssh.com" - "aes256-gcm@openssh.com" - "aes128-gcm@openssh.com" - "aes256-ctr" - "aes192-ctr" - "aes128-ctr" - ]; - description = lib.mdDoc '' - Allowed ciphers - - Defaults to recommended settings from both - - and - - ''; - }; - - macs = mkOption { - type = types.listOf types.str; - default = [ - "hmac-sha2-512-etm@openssh.com" - "hmac-sha2-256-etm@openssh.com" - "umac-128-etm@openssh.com" - "hmac-sha2-512" - "hmac-sha2-256" - "umac-128@openssh.com" - ]; - description = lib.mdDoc '' - Allowed MACs - - Defaults to recommended settings from both - - and - - ''; - }; settings = mkOption { @@ -374,7 +305,13 @@ in ~/.ssh/authorized_keys from and sshd_config Match Host directives. ''; }; - + X11Forwarding = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to allow X11 connections to be forwarded. + ''; + }; PasswordAuthentication = mkOption { type = types.bool; default = true; @@ -396,6 +333,70 @@ in Specifies whether keyboard-interactive authentication is allowed. ''; }; + GatewayPorts = mkOption { + type = types.str; + default = "no"; + description = lib.mdDoc '' + Specifies whether remote hosts are allowed to connect to + ports forwarded for the client. See + {manpage}`sshd_config(5)`. + ''; + }; + KexAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "sntrup761x25519-sha512@openssh.com" + "curve25519-sha256" + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + ]; + description = lib.mdDoc '' + Allowed key exchange algorithms + + Uses the lower bound recommended in both + + and + + ''; + }; + Macs = mkOption { + type = types.listOf types.str; + default = [ + "hmac-sha2-512-etm@openssh.com" + "hmac-sha2-256-etm@openssh.com" + "umac-128-etm@openssh.com" + "hmac-sha2-512" + "hmac-sha2-256" + "umac-128@openssh.com" + ]; + description = lib.mdDoc '' + Allowed MACs + + Defaults to recommended settings from both + + and + + ''; + }; + Ciphers = mkOption { + type = types.listOf types.str; + default = [ + "chacha20-poly1305@openssh.com" + "aes256-gcm@openssh.com" + "aes128-gcm@openssh.com" + "aes256-ctr" + "aes192-ctr" + "aes128-ctr" + ]; + description = lib.mdDoc '' + Allowed ciphers + + Defaults to recommended settings from both + + and + + ''; + }; }; }); }; @@ -555,17 +556,10 @@ in ${optionalString cfgc.setXAuthLocation '' XAuthLocation ${pkgs.xorg.xauth}/bin/xauth ''} - - X11Forwarding ${if cfg.forwardX11 then "yes" else "no"} - ${optionalString cfg.allowSFTP '' Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags} ''} - - GatewayPorts ${cfg.gatewayPorts} - PrintMotd no # handled by pam_motd - AuthorizedKeysFile ${toString cfg.authorizedKeysFiles} ${optionalString (cfg.authorizedKeysCommand != "none") '' AuthorizedKeysCommand ${cfg.authorizedKeysCommand} @@ -575,13 +569,9 @@ in ${flip concatMapStrings cfg.hostKeys (k: '' HostKey ${k.path} '')} - - KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms} - Ciphers ${concatStringsSep "," cfg.ciphers} - MACs ${concatStringsSep "," cfg.macs} ''; - assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; + assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] ++ forEach cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; diff --git a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix index 73567ca0bc..7c9fa62ae9 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix @@ -115,7 +115,7 @@ in MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}"; MEILI_NO_ANALYTICS = toString cfg.noAnalytics; MEILI_ENV = cfg.environment; - MEILI_DUMPS_DIR = "/var/lib/meilisearch/dumps"; + MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps"; MEILI_LOG_LEVEL = cfg.logLevel; MEILI_MAX_INDEX_SIZE = cfg.maxIndexSize; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix index 55120799c9..5583c39368 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix @@ -55,7 +55,7 @@ in options.services.kanidm = { enableClient = lib.mkEnableOption (lib.mdDoc "the Kanidm client"); enableServer = lib.mkEnableOption (lib.mdDoc "the Kanidm server"); - enablePam = lib.mkEnableOption (lib.mdDoc "the Kanidm PAM and NSS integration."); + enablePam = lib.mkEnableOption (lib.mdDoc "the Kanidm PAM and NSS integration"); serverSettings = lib.mkOption { type = lib.types.submodule { diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix index e446e606ca..664335cb58 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -6,7 +6,7 @@ let cfg = config.services.privacyidea; opt = options.services.privacyidea; - uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python39; }; + uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python310; }; python = uwsgi.python3; penv = python.withPackages (const [ pkgs.privacyidea ]); logCfg = pkgs.writeText "privacyidea-log.cfg" '' @@ -41,7 +41,7 @@ let piCfgFile = pkgs.writeText "privacyidea.cfg" '' SUPERUSER_REALM = [ '${concatStringsSep "', '" cfg.superuserRealm}' ] - SQLALCHEMY_DATABASE_URI = 'postgresql:///privacyidea' + SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2:///privacyidea' SECRET_KEY = '${cfg.secretKey}' PI_PEPPER = '${cfg.pepper}' PI_ENCFILE = '${cfg.encFile}' diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix index ffd1085bde..9c6284fd1b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix @@ -68,7 +68,7 @@ let in { options.services.cloudlog = with types; { - enable = mkEnableOption (mdDoc "Whether to enable Cloudlog."); + enable = mkEnableOption (mdDoc "Whether to enable Cloudlog"); dataDir = mkOption { type = str; default = "/var/lib/cloudlog"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index 54cd5fd33b..2153720836 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix @@ -148,7 +148,7 @@ let ]; options = { - enable = mkEnableOption (lib.mdDoc "DokuWiki web application."); + enable = mkEnableOption (lib.mdDoc "DokuWiki web application"); package = mkOption { type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix index 15ef09aa0b..747b85f94c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix @@ -12,7 +12,7 @@ in { options = { services.galene = { - enable = mkEnableOption (lib.mdDoc "Galene Service."); + enable = mkEnableOption (lib.mdDoc "Galene Service"); stateDir = mkOption { default = defaultstateDir; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix index 86716a0264..0fc283ff52 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix @@ -7,7 +7,7 @@ in { enable = mkEnableOption (lib.mdDoc "hledger-web service"); - serveApi = mkEnableOption (lib.mdDoc "Serve only the JSON web API, without the web UI."); + serveApi = mkEnableOption (lib.mdDoc "Serve only the JSON web API, without the web UI"); host = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix index 293cbb3af4..b2e2741671 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix @@ -36,7 +36,7 @@ in description = lib.mdDoc "Location of Jirafeau storage directory."; }; - enable = mkEnableOption (lib.mdDoc "Jirafeau file upload application."); + enable = mkEnableOption (lib.mdDoc "Jirafeau file upload application"); extraConfig = mkOption { type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix index 7093d1de0d..dd51174c8b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix @@ -32,7 +32,7 @@ in # interface options.services.limesurvey = { - enable = mkEnableOption (lib.mdDoc "Limesurvey web application."); + enable = mkEnableOption (lib.mdDoc "Limesurvey web application"); database = { type = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix index 50213ec252..f5a9cfac5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix @@ -35,7 +35,8 @@ let Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } '' mkdir -p $out - ${cfg.package}/bin/caddy fmt ${Caddyfile}/Caddyfile > $out/Caddyfile + cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile + caddy fmt --overwrite $out/Caddyfile ''; in "${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 1837ec936c..bc5b4be510 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -203,7 +203,8 @@ let proxy_send_timeout ${cfg.proxyTimeout}; proxy_read_timeout ${cfg.proxyTimeout}; proxy_http_version 1.1; - # don't let clients close the keep-alive connection to upstream + # don't let clients close the keep-alive connection to upstream. See the nginx blog for details: + # https://www.nginx.com/blog/avoiding-top-10-nginx-configuration-mistakes/#no-keepalives proxy_set_header "Connection" ""; include ${recommendedProxyConfig}; ''} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 65b94f61c4..181db01ad8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -28,52 +28,11 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; - inherit (pkgs) writeText; inherit (lib) getBin optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; - ini = pkgs.formats.ini { }; - - gtkrc2 = writeText "gtkrc-2.0" '' - # Default GTK+ 2 config for NixOS Plasma 5 - include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" - style "user-font" - { - font_name="Sans Serif Regular" - } - widget_class "*" style "user-font" - gtk-font-name="Sans Serif Regular 10" - gtk-theme-name="Breeze" - gtk-icon-theme-name="breeze" - gtk-fallback-icon-theme="hicolor" - gtk-cursor-theme-name="breeze_cursors" - gtk-toolbar-style=GTK_TOOLBAR_ICONS - gtk-menu-images=1 - gtk-button-images=1 - ''; - - gtk3_settings = ini.generate "settings.ini" { - Settings = { - gtk-font-name = "Sans Serif Regular 10"; - gtk-theme-name = "Breeze"; - gtk-icon-theme-name = "breeze"; - gtk-fallback-icon-theme = "hicolor"; - gtk-cursor-theme-name = "breeze_cursors"; - gtk-toolbar-style = "GTK_TOOLBAR_ICONS"; - gtk-menu-images = 1; - gtk-button-images = 1; - }; - }; - - kcminputrc = ini.generate "kcminputrc" { - Mouse = { - cursorTheme = "breeze_cursors"; - cursorSize = 0; - }; - }; - activationScript = '' ${set_XDG_CONFIG_HOME} @@ -119,37 +78,6 @@ let XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config} ''; - startplasma = '' - ${set_XDG_CONFIG_HOME} - mkdir -p "''${XDG_CONFIG_HOME}" - '' + optionalString config.hardware.pulseaudio.enable '' - # Load PulseAudio module for routing support. - # See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - '' + '' - ${activationScript} - - # Create default configurations if Plasma has never been started. - kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals" - if ! [ -f "$kdeglobals" ]; then - kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc" - if ! [ -f "$kcminputrc" ]; then - cat ${kcminputrc} >"$kcminputrc" - fi - - gtkrc2="$HOME/.gtkrc-2.0" - if ! [ -f "$gtkrc2" ]; then - cat ${gtkrc2} >"$gtkrc2" - fi - - gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini" - if ! [ -f "$gtk3_settings" ]; then - mkdir -p "$(dirname "$gtk3_settings")" - cat ${gtk3_settings} >"$gtk3_settings" - fi - fi - ''; - in { @@ -474,7 +402,6 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; - services.xserver.displayManager.setupCommands = startplasma; nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) @@ -521,6 +448,7 @@ in dolphin-plugins ffmpegthumbs kdegraphics-thumbnailers + pkgs.kio-admin kio-extras ]; optionalPackages = [ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index 574657a50c..9c88d12ca6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -106,9 +106,9 @@ in description = lib.mdDoc '' Extra custom layouts that will be included in the xkb configuration. Information on how to create a new layout can be found here: - [](https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts). + . For more examples see - [](https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples) + ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix index 701d242abc..125f75d667 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix @@ -128,13 +128,13 @@ in HostKey ${initrdKeyPath path} '')} - KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms} - Ciphers ${concatStringsSep "," sshdCfg.ciphers} - MACs ${concatStringsSep "," sshdCfg.macs} + KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms} + Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers} + MACs ${concatStringsSep "," sshdCfg.settings.Macs} - LogLevel ${sshdCfg.logLevel} + LogLevel ${sshdCfg.settings.LogLevel} - ${if sshdCfg.useDns then '' + ${if sshdCfg.settings.UseDns then '' UseDNS yes '' else '' UseDNS no diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index 8f203b2c8b..0298e28f32 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -20,7 +20,7 @@ in ###### interface options = { - boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel.") // { + boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel") // { default = true; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 03d03cb348..cdb5d8bf3c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -929,7 +929,14 @@ in ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []); # copy the cryptsetup binary and it's dependencies - boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' + boot.initrd.extraUtilsCommands = let + pbkdf2-sha512 = pkgs.runCommandCC "pbkdf2-sha512" { buildInputs = [ pkgs.openssl ]; } '' + mkdir -p "$out/bin" + cc -O3 -lcrypto ${./pbkdf2-sha512.c} -o "$out/bin/pbkdf2-sha512" + strip -s "$out/bin/pbkdf2-sha512" + ''; + in + mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup copy_bin_and_libs ${askPass}/bin/cryptsetup-askpass sed -i s,/bin/sh,$out/bin/sh, $out/bin/cryptsetup-askpass @@ -939,9 +946,7 @@ in copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl - cc -O3 -I${pkgs.openssl.dev}/include -L${lib.getLib pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto - strip -s pbkdf2-sha512 - copy_bin_and_libs pbkdf2-sha512 + copy_bin_and_libs ${pbkdf2-sha512}/bin/pbkdf2-sha512 mkdir -p $out/etc/ssl cp -pdv ${pkgs.openssl.out}/etc/ssl/openssl.cnf $out/etc/ssl diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index 4fcaeebffc..d26ea7597c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -90,7 +90,7 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = pkgs.runCommandCC "extra-utils" + extraUtils = pkgs.runCommand "extra-utils" { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix index 03ef00e568..2dbc95e38e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix @@ -66,7 +66,9 @@ in { uid = config.ids.uids.systemd-coredump; group = "systemd-coredump"; }; - users.groups.systemd-coredump = {}; + users.groups.systemd-coredump = { + gid = config.ids.gids.systemd-coredump; + }; }) (mkIf (!cfg.enable) { diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix index 450b805f0f..76344f5f87 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix @@ -7,11 +7,11 @@ let device = "none"; fsType = "envfs"; options = [ - "fallback-path=${pkgs.runCommand "fallback-path" {} '' + "fallback-path=${pkgs.runCommand "fallback-path" {} ('' mkdir -p $out - ln -s ${pkgs.coreutils}/bin/env $out/env - ln -s ${config.system.build.binsh}/bin/sh $out/sh - ''}" + ln -s ${config.environment.usrbinenv} $out/env + ln -s ${config.environment.binsh} $out/sh + '' + cfg.extraFallbackPathCommands)}" ]; }; "/bin" = { @@ -31,11 +31,19 @@ in { etc. ''; }; + package = lib.mkOption { type = lib.types.package; - description = lib.mdDoc "Which package to use for the envfs."; default = pkgs.envfs; defaultText = lib.literalExpression "pkgs.envfs"; + description = lib.mdDoc "Which package to use for the envfs."; + }; + + extraFallbackPathCommands = lib.mkOption { + type = lib.types.lines; + default = ""; + example = "ln -s $''{pkgs.bash}/bin/bash $out/bash"; + description = lib.mdDoc "Extra commands to run in the package that contains fallback executables in case not other executable is found"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index e6c2c72339..aa44f26426 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -25,11 +25,7 @@ in config = { - assertions = [ - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; - message = "ENA driver fails to build with kernel >= 5.17"; - } - ]; + assertions = [ ]; boot.growPartition = true; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix b/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix new file mode 100644 index 0000000000..d066932b61 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix @@ -0,0 +1,61 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.virtualisation.multipass; +in +{ + options = { + virtualisation.multipass = { + enable = lib.mkEnableOption (lib.mdDoc '' + Multipass, a simple manager for virtualised Ubuntu instances. + ''); + + logLevel = lib.mkOption { + type = lib.types.enum [ "error" "warning" "info" "debug" "trace" ]; + default = "debug"; + description = lib.mdDoc '' + The logging verbosity of the multipassd binary. + ''; + }; + + package = lib.mkPackageOptionMD pkgs "multipass" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.multipass = { + description = "Multipass orchestrates virtual Ubuntu instances."; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + + environment = { + "XDG_DATA_HOME" = "/var/lib/multipass/data"; + "XDG_CACHE_HOME" = "/var/lib/multipass/cache"; + "XDG_CONFIG_HOME" = "/var/lib/multipass/config"; + }; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}"; + SyslogIdentifer = "multipassd"; + Restart = "on-failure"; + TimeoutStopSec = 300; + Type = "simple"; + + WorkingDirectory = "/var/lib/multipass"; + + StateDirectory = "multipass"; + StateDirectoryMode = "0750"; + CacheDirectory = "multipass"; + CacheDirectoryMode = "0750"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix index 2ea23d958c..bb42e6de06 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix @@ -107,6 +107,46 @@ in { }; }); }; + postExportCommands = mkOption { + type = types.lines; + default = ""; + example = '' + ${pkgs.cot}/bin/cot edit-hardware "$fn" \ + -v vmx-14 \ + --nics 2 \ + --nic-types VMXNET3 \ + --nic-names 'Nic name' \ + --nic-networks 'Nic match' \ + --network-descriptions 'Nic description' \ + --scsi-subtypes VirtualSCSI + ''; + description = lib.mdDoc '' + Extra commands to run after exporting the OVA to `$fn`. + ''; + }; + storageController = mkOption { + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + example = { + name = "SCSI"; + add = "scsi"; + portcount = 16; + bootable = "on"; + hostiocache = "on"; + }; + default = { + name = "SATA"; + add = "sata"; + portcount = 4; + bootable = "on"; + hostiocache = "on"; + }; + description = lib.mdDoc '' + Parameters passed to the VirtualBox appliance. Must have at least + `name`. + + Run `VBoxManage storagectl --help` to see more options. + ''; + }; }; }; @@ -167,11 +207,11 @@ in { VBoxManage modifyvm "$vmName" \ --memory ${toString cfg.memorySize} \ ${lib.cli.toGNUCommandLineShell { } cfg.params} - VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on - VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ + VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ --medium disk.vmdk ${optionalString (cfg.extraDisk != null) '' - VBoxManage storageattach "$vmName" --storagectl SATA --port 1 --device 0 --type hdd \ + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ --medium data-disk.vmdk ''} @@ -179,6 +219,7 @@ in { mkdir -p $out fn="$out/${cfg.vmFileName}" VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams} + ${cfg.postExportCommands} rm -v $diskImage diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index a041faa8fe..1af7456fad 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -134,6 +134,7 @@ in { cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; cloudlog = handleTest ./cloudlog.nix {}; cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; + cockpit = handleTest ./cockpit.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; collectd = handleTest ./collectd.nix {}; connman = handleTest ./connman.nix {}; @@ -247,6 +248,7 @@ in { gnome = handleTest ./gnome.nix {}; gnome-flashback = handleTest ./gnome-flashback.nix {}; gnome-xorg = handleTest ./gnome-xorg.nix {}; + gnupg = handleTest ./gnupg.nix {}; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; @@ -398,6 +400,7 @@ in { minidlna = handleTest ./minidlna.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; + miriway = handleTest ./miriway.nix {}; misc = handleTest ./misc.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; mod_perl = handleTest ./mod_perl.nix {}; @@ -411,8 +414,11 @@ in { mpd = handleTest ./mpd.nix {}; mpv = handleTest ./mpv.nix {}; mtp = handleTest ./mtp.nix {}; + multipass = handleTest ./multipass.nix {}; mumble = handleTest ./mumble.nix {}; - musescore = handleTest ./musescore.nix {}; + # Fails on aarch64-linux at the PDF creation step - need to debug this on an + # aarch64 machine.. + musescore = handleTestOn ["x86_64-linux"] ./musescore.nix {}; munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; mxisd = handleTest ./mxisd.nix {}; @@ -514,7 +520,6 @@ in { peering-manager = handleTest ./web-apps/peering-manager.nix {}; peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; pgadmin4 = handleTest ./pgadmin4.nix {}; - pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; phosh = handleTest ./phosh.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/bpf.nix b/third_party/nixpkgs/nixos/tests/bpf.nix index 5868e3bfcb..5dc9740477 100644 --- a/third_party/nixpkgs/nixos/tests/bpf.nix +++ b/third_party/nixpkgs/nixos/tests/bpf.nix @@ -25,5 +25,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { print(machine.succeed("bpftrace -e 'kprobe:schedule { " " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " "}'")) + # module BTF (bpftrace >= 0.17) + print(machine.succeed("bpftrace -e 'kfunc:nft_trans_alloc_gfp { " + " printf(\"portid: %d\\n\",args->ctx->portid); " + "} BEGIN { exit() }'")) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/cockpit.nix b/third_party/nixpkgs/nixos/tests/cockpit.nix new file mode 100644 index 0000000000..4a4983f9bc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/cockpit.nix @@ -0,0 +1,135 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + user = "alice"; # from ./common/user-account.nix + password = "foobar"; # from ./common/user-account.nix + in { + name = "cockpit"; + meta = { + maintainers = with lib.maintainers; [ lucasew ]; + }; + nodes = { + server = { config, ... }: { + imports = [ ./common/user-account.nix ]; + security.polkit.enable = true; + users.users.${user} = { + extraGroups = [ "wheel" ]; + }; + services.cockpit = { + enable = true; + openFirewall = true; + settings = { + WebService = { + Origins = "https://server:9090"; + }; + }; + }; + }; + client = { config, ... }: { + imports = [ ./common/user-account.nix ]; + environment.systemPackages = let + seleniumScript = pkgs.writers.writePython3Bin "selenium-script" { + libraries = with pkgs.python3Packages; [ selenium ]; + } '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + from time import sleep + + + def log(msg): + from sys import stderr + print(f"[*] {msg}", file=stderr) + + + log("Initializing") + + options = Options() + options.add_argument("--headless") + + driver = webdriver.Firefox(options=options) + + driver.implicitly_wait(10) + + log("Opening homepage") + driver.get("https://server:9090") + + wait = WebDriverWait(driver, 60) + + + def wait_elem(by, query): + wait.until(EC.presence_of_element_located((by, query))) + + + def wait_title_contains(title): + wait.until(EC.title_contains(title)) + + + def find_element(by, query): + return driver.find_element(by, query) + + + def set_value(elem, value): + script = 'arguments[0].value = arguments[1]' + return driver.execute_script(script, elem, value) + + + log("Waiting for the homepage to load") + + # cockpit sets initial title as hostname + wait_title_contains("server") + wait_elem(By.CSS_SELECTOR, 'input#login-user-input') + + log("Homepage loaded!") + + log("Filling out username") + login_input = find_element(By.CSS_SELECTOR, 'input#login-user-input') + set_value(login_input, "${user}") + + log("Filling out password") + password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input') + set_value(password_input, "${password}") + + log("Submiting credentials for login") + driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() + + # driver.implicitly_wait(1) + # driver.get("https://server:9090/system") + + log("Waiting dashboard to load") + wait_title_contains("${user}@server") + + log("Waiting for the frontend to initalize") + sleep(1) + + log("Looking for that banner that tells about limited access") + container_iframe = find_element(By.CSS_SELECTOR, 'iframe.container-frame') + driver.switch_to.frame(container_iframe) + + assert "Web console is running in limited access mode" in driver.page_source + + driver.close() + ''; + in with pkgs; [ firefox-unwrapped geckodriver seleniumScript ]; + }; + }; + + testScript = '' + start_all() + + server.wait_for_open_port(9090) + server.wait_for_unit("network.target") + server.wait_for_unit("multi-user.target") + server.systemctl("start", "polkit") + + client.wait_for_unit("multi-user.target") + + client.succeed("curl -k https://server:9090 -o /dev/stderr") + print(client.succeed("whoami")) + client.succeed('PYTHONUNBUFFERED=1 selenium-script') + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/cups-pdf.nix b/third_party/nixpkgs/nixos/tests/cups-pdf.nix index 70d14f29e2..957b0296a7 100644 --- a/third_party/nixpkgs/nixos/tests/cups-pdf.nix +++ b/third_party/nixpkgs/nixos/tests/cups-pdf.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { testScript = '' from subprocess import run - machine.wait_for_unit("cups.service") + machine.wait_for_unit("multi-user.target") for name in ("opt", "noopt"): text = f"test text {name}".upper() machine.wait_until_succeeds(f"lpstat -v {name}") diff --git a/third_party/nixpkgs/nixos/tests/gnupg.nix b/third_party/nixpkgs/nixos/tests/gnupg.nix new file mode 100644 index 0000000000..65a9a93007 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/gnupg.nix @@ -0,0 +1,118 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: + +{ + name = "gnupg"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # server for testing SSH + nodes.server = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + users.users.alice.isNormalUser = true; + services.openssh.enable = true; + }; + + # machine for testing GnuPG + nodes.machine = { pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + users.users.alice.isNormalUser = true; + services.getty.autologinUser = "alice"; + + environment.shellInit = '' + # preset a key passphrase in gpg-agent + preset_key() { + # find all keys + case "$1" in + ssh) grips=$(awk '/^[0-9A-F]/{print $1}' "''${GNUPGHOME:-$HOME/.gnupg}/sshcontrol") ;; + pgp) grips=$(gpg --with-keygrip --list-secret-keys | awk '/Keygrip/{print $3}') ;; + esac + + # try to preset the passphrase for each key found + for grip in $grips; do + "$(gpgconf --list-dirs libexecdir)/gpg-preset-passphrase" -c -P "$2" "$grip" + done + } + ''; + + programs.gnupg.agent.enable = true; + programs.gnupg.agent.enableSSHSupport = true; + }; + + testScript = + '' + import shlex + + + def as_alice(command: str) -> str: + """ + Wraps a command to run it as Alice in a login shell + """ + quoted = shlex.quote(command) + return "su --login alice --command " + quoted + + + start_all() + + with subtest("Wait for the autologin"): + machine.wait_until_tty_matches("1", "alice@machine") + + with subtest("Can generate a PGP key"): + # Note: this needs a tty because of pinentry + machine.send_chars("gpg --gen-key\n") + machine.wait_until_tty_matches("1", "Real name:") + machine.send_chars("Alice\n") + machine.wait_until_tty_matches("1", "Email address:") + machine.send_chars("alice@machine\n") + machine.wait_until_tty_matches("1", "Change") + machine.send_chars("O\n") + machine.wait_until_tty_matches("1", "Please enter") + machine.send_chars("pgp_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please re-enter") + machine.send_chars("pgp_p4ssphrase\n") + machine.wait_until_tty_matches("1", "public and secret key created") + + with subtest("Confirm the key is in the keyring"): + machine.wait_until_succeeds(as_alice("gpg --list-secret-keys | grep -q alice@machine")) + + with subtest("Can generate and add an SSH key"): + machine.succeed(as_alice("ssh-keygen -t ed25519 -f alice -N ssh_p4ssphrase")) + + # Note: apparently this must be run before using the OpenSSH agent + # socket for the first time in a tty. It's not needed for `ssh` + # because there's a hook that calls it automatically (only in NixOS). + machine.send_chars("gpg-connect-agent updatestartuptty /bye\n") + + # Note: again, this needs a tty because of pinentry + machine.send_chars("ssh-add alice\n") + machine.wait_until_tty_matches("1", "Enter passphrase") + machine.send_chars("ssh_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please enter") + machine.send_chars("ssh_agent_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please re-enter") + machine.send_chars("ssh_agent_p4ssphrase\n") + + with subtest("Confirm the SSH key has been registered"): + machine.wait_until_succeeds(as_alice("ssh-add -l | grep -q alice@machine")) + + with subtest("Can preset the key passphrases in the agent"): + machine.succeed(as_alice("echo allow-preset-passphrase > .gnupg/gpg-agent.conf")) + machine.succeed(as_alice("pkill gpg-agent")) + machine.succeed(as_alice("preset_key pgp pgp_p4ssphrase")) + machine.succeed(as_alice("preset_key ssh ssh_agent_p4ssphrase")) + + with subtest("Can encrypt and decrypt a message"): + machine.succeed(as_alice("echo Hello | gpg -e -r alice | gpg -d | grep -q Hello")) + + with subtest("Can log into the server"): + # Install Alice's public key + public_key = machine.succeed(as_alice("cat alice.pub")) + server.succeed("mkdir /etc/ssh/authorized_keys.d") + server.succeed(f"printf '{public_key}' > /etc/ssh/authorized_keys.d/alice") + + server.wait_for_open_port(22) + machine.succeed(as_alice("ssh -i alice -o StrictHostKeyChecking=no server exit")) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/miriway.nix b/third_party/nixpkgs/nixos/tests/miriway.nix new file mode 100644 index 0000000000..c4c50646f0 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/miriway.nix @@ -0,0 +1,126 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "miriway"; + + meta = { + maintainers = with lib.maintainers; [ OPNA2608 ]; + # FIXME On ARM Miriway inside the VM doesn't receive keyboard inputs, why? + broken = pkgs.stdenv.hostPlatform.isAarch; + }; + + nodes.machine = { config, ... }: { + imports = [ + ./common/auto.nix + ./common/user-account.nix + ]; + + # Seems to very rarely get interrupted by oom-killer + virtualisation.memorySize = 2047; + + test-support.displayManager.auto = { + enable = true; + user = "alice"; + }; + + services.xserver = { + enable = true; + displayManager.defaultSession = lib.mkForce "miriway"; + }; + + programs.miriway = { + enable = true; + config = '' + add-wayland-extensions=all + + ctrl-alt=t:foot --maximized + ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty --option window.startup_mode=maximized + + shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + + shell-component=foot --maximized + ''; + }; + + environment = { + shellAliases = { + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; + test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + }; + + systemPackages = with pkgs; [ + mesa-demos + wayland-utils + foot + alacritty + ]; + + # To help with OCR + etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { + main = { + font = "inconsolata:size=16"; + }; + colors = rec { + foreground = "000000"; + background = "ffffff"; + regular2 = foreground; + }; + }; + etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } { + font = rec { + normal.family = "Inconsolata"; + bold.family = normal.family; + italic.family = normal.family; + bold_italic.family = normal.family; + size = 16; + }; + colors = rec { + primary = { + foreground = "0x000000"; + background = "0xffffff"; + }; + normal = { + green = primary.foreground; + }; + }; + }; + }; + + fonts.fonts = [ pkgs.inconsolata ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_unit("multi-user.target") + + # Wait for Miriway to complete startup + machine.wait_for_file("/run/user/1000/wayland-0") + machine.succeed("pgrep miriway-shell") + machine.screenshot("miriway_launched") + + # Test Wayland + # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind + # machine.send_key("ctrl-alt-t") + machine.wait_for_text("alice@machine") + machine.send_chars("test-wayland\n") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + machine.copy_from_vm("/tmp/test-wayland.out") + machine.screenshot("foot_wayland_info") + # Only succeeds when a mouse is moved inside an interactive session? + # machine.send_chars("exit\n") + # machine.wait_until_fails("pgrep foot") + machine.succeed("pkill foot") + + # Test XWayland + machine.send_key("ctrl-alt-a") + machine.wait_for_text("alice@machine") + machine.send_chars("test-x11\n") + machine.wait_for_file("/tmp/test-x11-exit-ok") + machine.copy_from_vm("/tmp/test-x11.out") + machine.screenshot("alacritty_glinfo") + # Only succeeds when a mouse is moved inside an interactive session? + # machine.send_chars("exit\n") + # machine.wait_until_fails("pgrep alacritty") + machine.succeed("pkill alacritty") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/multipass.nix b/third_party/nixpkgs/nixos/tests/multipass.nix new file mode 100644 index 0000000000..0980e9195f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/multipass.nix @@ -0,0 +1,37 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + multipass-image = import ../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + +in +{ + name = "multipass"; + + meta.maintainers = [ lib.maintainers.jnsgruk ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + cores = 1; + memorySize = 1024; + diskSize = 4096; + + multipass.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("multipass.service") + machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet") + + # Wait for Multipass to settle + machine.sleep(1) + + machine.succeed("multipass list") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/musescore.nix b/third_party/nixpkgs/nixos/tests/musescore.nix index ac2f4ba74c..6aeb0558a4 100644 --- a/third_party/nixpkgs/nixos/tests/musescore.nix +++ b/third_party/nixpkgs/nixos/tests/musescore.nix @@ -2,13 +2,12 @@ import ./make-test-python.nix ({ pkgs, ...} : let # Make sure we don't have to go through the startup tutorial - customMuseScoreConfig = pkgs.writeText "MuseScore3.ini" '' + customMuseScoreConfig = pkgs.writeText "MuseScore4.ini" '' [application] - startup\firstStart=false + hasCompletedFirstLaunchSetup=true - [ui] - application\startup\showTours=false - application\startup\showStartCenter=false + [project] + preferredScoreCreationMode=1 ''; in { @@ -40,51 +39,68 @@ in # Inject custom settings machine.succeed("mkdir -p /root/.config/MuseScore/") machine.succeed( - "cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore3.ini" + "cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore4.ini" ) # Start MuseScore window machine.execute("DISPLAY=:0.0 mscore >&2 &") # Wait until MuseScore has launched - machine.wait_for_window("MuseScore") + machine.wait_for_window("MuseScore 4") # Wait until the window has completely initialised - machine.wait_for_text("MuseScore") - - # Start entering notes - machine.send_key("n") - # Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen - machine.send_chars("cdef6gg5aaaa7g") - # Make sure the VM catches up with all the keys - machine.sleep(1) + machine.wait_for_text("MuseScore 4") machine.screenshot("MuseScore0") + # Create a new score + machine.send_key("ctrl-n") + + # Wait until the creation wizard appears + machine.wait_for_window("New score") + + machine.screenshot("MuseScore1") + + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("right") + machine.send_key("right") + machine.send_key("ret") + + machine.sleep(1) + + # Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen + machine.send_chars("cdef6gg5aaaa7g") + machine.sleep(1) + + machine.screenshot("MuseScore2") + # Go to the export dialogue and create a PDF machine.send_key("alt-f") machine.sleep(1) machine.send_key("e") # Wait until the export dialogue appears. - machine.wait_for_window("Export") - machine.screenshot("MuseScore1") - machine.send_key("shift-tab") - machine.sleep(1) - machine.send_key("shift-tab") - machine.sleep(1) - machine.send_key("ret") - machine.sleep(1) - machine.send_key("ret") - - machine.screenshot("MuseScore2") - - # Wait until PDF is exported - machine.wait_for_file("/root/Documents/MuseScore3/Scores/Untitled.pdf") - - # Check that it contains the title of the score - machine.succeed("pdfgrep Title /root/Documents/MuseScore3/Scores/Untitled.pdf") + machine.wait_for_text("Export") machine.screenshot("MuseScore3") + + machine.send_key("shift-tab") + machine.sleep(1) + machine.send_key("ret") + machine.sleep(1) + machine.send_key("ret") + + machine.screenshot("MuseScore4") + + # Wait until PDF is exported + machine.wait_for_file('"/root/Documents/MuseScore4/Scores/Untitled score.pdf"') + + # Check that it contains the title of the score + machine.succeed('pdfgrep "Untitled score" "/root/Documents/MuseScore4/Scores/Untitled score.pdf"') + + machine.screenshot("MuseScore5") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/nebula.nix b/third_party/nixpkgs/nixos/tests/nebula.nix index 372cfebdf8..89b91d89fc 100644 --- a/third_party/nixpkgs/nixos/tests/nebula.nix +++ b/third_party/nixpkgs/nixos/tests/nebula.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let environment.systemPackages = [ pkgs.nebula ]; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; services.openssh.enable = true; + networking.interfaces.eth1.useDHCP = false; services.nebula.networks.smoke = { # Note that these paths won't exist when the machine is first booted. @@ -30,13 +31,14 @@ in lighthouse = { ... } @ args: makeNebulaNode args "lighthouse" { - networking.interfaces.eth1.ipv4.addresses = [{ + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.1"; prefixLength = 24; }]; services.nebula.networks.smoke = { isLighthouse = true; + isRelay = true; firewall = { outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -44,9 +46,9 @@ in }; }; - node2 = { ... } @ args: - makeNebulaNode args "node2" { - networking.interfaces.eth1.ipv4.addresses = [{ + allowAny = { ... } @ args: + makeNebulaNode args "allowAny" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.2"; prefixLength = 24; }]; @@ -55,6 +57,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -62,9 +65,9 @@ in }; }; - node3 = { ... } @ args: - makeNebulaNode args "node3" { - networking.interfaces.eth1.ipv4.addresses = [{ + allowFromLighthouse = { ... } @ args: + makeNebulaNode args "allowFromLighthouse" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.3"; prefixLength = 24; }]; @@ -73,6 +76,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; inbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; @@ -80,9 +84,9 @@ in }; }; - node4 = { ... } @ args: - makeNebulaNode args "node4" { - networking.interfaces.eth1.ipv4.addresses = [{ + allowToLighthouse = { ... } @ args: + makeNebulaNode args "allowToLighthouse" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.4"; prefixLength = 24; }]; @@ -92,6 +96,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -99,9 +104,9 @@ in }; }; - node5 = { ... } @ args: - makeNebulaNode args "node5" { - networking.interfaces.eth1.ipv4.addresses = [{ + disabled = { ... } @ args: + makeNebulaNode args "disabled" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.5"; prefixLength = 24; }]; @@ -111,6 +116,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -123,12 +129,14 @@ in testScript = let setUpPrivateKey = name: '' - ${name}.succeed( - "mkdir -p /root/.ssh", - "chown 700 /root/.ssh", - "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", - "chown 600 /root/.ssh/id_snakeoil", - ) + ${name}.start() + ${name}.succeed( + "mkdir -p /root/.ssh", + "chown 700 /root/.ssh", + "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", + "chown 600 /root/.ssh/id_snakeoil", + "mkdir -p /root" + ) ''; # From what I can tell, StrictHostKeyChecking=no is necessary for ssh to work between machines. @@ -146,26 +154,48 @@ in ${name}.succeed( "mkdir -p /etc/nebula", "nebula-cert keygen -out-key /etc/nebula/${name}.key -out-pub /etc/nebula/${name}.pub", - "scp ${sshOpts} /etc/nebula/${name}.pub 192.168.1.1:/tmp/${name}.pub", + "scp ${sshOpts} /etc/nebula/${name}.pub root@192.168.1.1:/root/${name}.pub", ) lighthouse.succeed( - 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /tmp/${name}.pub -out-crt /tmp/${name}.crt', + 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /root/${name}.pub -out-crt /root/${name}.crt' ) ${name}.succeed( - "scp ${sshOpts} 192.168.1.1:/tmp/${name}.crt /etc/nebula/${name}.crt", - "scp ${sshOpts} 192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt", + "scp ${sshOpts} root@192.168.1.1:/root/${name}.crt /etc/nebula/${name}.crt", + "scp ${sshOpts} root@192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt", + '(id nebula-smoke >/dev/null && chown -R nebula-smoke:nebula-smoke /etc/nebula) || true' ) ''; - in '' - start_all() + getPublicIp = node: '' + ${node}.succeed("ip --brief addr show eth1 | awk '{print $3}' | tail -n1 | cut -d/ -f1").strip() + ''; + # Never do this for anything security critical! (Thankfully it's just a test.) + # Restart Nebula right after the mutual block and/or restore so the state is fresh. + blockTrafficBetween = nodeA: nodeB: '' + node_a = ${getPublicIp nodeA} + node_b = ${getPublicIp nodeB} + ${nodeA}.succeed("iptables -I INPUT -s " + node_b + " -j DROP") + ${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP") + ${nodeA}.systemctl("restart nebula@smoke.service") + ${nodeB}.systemctl("restart nebula@smoke.service") + ''; + allowTrafficBetween = nodeA: nodeB: '' + node_a = ${getPublicIp nodeA} + node_b = ${getPublicIp nodeB} + ${nodeA}.succeed("iptables -D INPUT -s " + node_b + " -j DROP") + ${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP") + ${nodeA}.systemctl("restart nebula@smoke.service") + ${nodeB}.systemctl("restart nebula@smoke.service") + ''; + in '' # Create the certificate and sign the lighthouse's keys. ${setUpPrivateKey "lighthouse"} lighthouse.succeed( "mkdir -p /etc/nebula", 'nebula-cert ca -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key', 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -ip "10.0.100.1/24" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key', + 'chown -R nebula-smoke:nebula-smoke /etc/nebula' ) # Reboot the lighthouse and verify that the nebula service comes up on boot. @@ -175,49 +205,104 @@ in lighthouse.wait_for_unit("nebula@smoke.service") lighthouse.succeed("ping -c5 10.0.100.1") - # Create keys for node2's nebula service and test that it comes up. - ${setUpPrivateKey "node2"} - ${signKeysFor "node2" "10.0.100.2/24"} - ${restartAndCheckNebula "node2" "10.0.100.2"} + # Create keys for allowAny's nebula service and test that it comes up. + ${setUpPrivateKey "allowAny"} + ${signKeysFor "allowAny" "10.0.100.2/24"} + ${restartAndCheckNebula "allowAny" "10.0.100.2"} - # Create keys for node3's nebula service and test that it comes up. - ${setUpPrivateKey "node3"} - ${signKeysFor "node3" "10.0.100.3/24"} - ${restartAndCheckNebula "node3" "10.0.100.3"} + # Create keys for allowFromLighthouse's nebula service and test that it comes up. + ${setUpPrivateKey "allowFromLighthouse"} + ${signKeysFor "allowFromLighthouse" "10.0.100.3/24"} + ${restartAndCheckNebula "allowFromLighthouse" "10.0.100.3"} - # Create keys for node4's nebula service and test that it comes up. - ${setUpPrivateKey "node4"} - ${signKeysFor "node4" "10.0.100.4/24"} - ${restartAndCheckNebula "node4" "10.0.100.4"} + # Create keys for allowToLighthouse's nebula service and test that it comes up. + ${setUpPrivateKey "allowToLighthouse"} + ${signKeysFor "allowToLighthouse" "10.0.100.4/24"} + ${restartAndCheckNebula "allowToLighthouse" "10.0.100.4"} - # Create keys for node4's nebula service and test that it does not come up. - ${setUpPrivateKey "node5"} - ${signKeysFor "node5" "10.0.100.5/24"} - node5.fail("systemctl status nebula@smoke.service") - node5.fail("ping -c5 10.0.100.5") + # Create keys for disabled's nebula service and test that it does not come up. + ${setUpPrivateKey "disabled"} + ${signKeysFor "disabled" "10.0.100.5/24"} + disabled.fail("systemctl status nebula@smoke.service") + disabled.fail("ping -c5 10.0.100.5") - # The lighthouse can ping node2 and node3 but not node5 + # The lighthouse can ping allowAny and allowFromLighthouse but not disabled lighthouse.succeed("ping -c3 10.0.100.2") lighthouse.succeed("ping -c3 10.0.100.3") lighthouse.fail("ping -c3 10.0.100.5") - # node2 can ping the lighthouse, but not node3 because of its inbound firewall - node2.succeed("ping -c3 10.0.100.1") - node2.fail("ping -c3 10.0.100.3") + # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall + allowAny.succeed("ping -c3 10.0.100.1") + allowAny.fail("ping -c3 10.0.100.3") - # node3 can ping the lighthouse and node2 - node3.succeed("ping -c3 10.0.100.1") - node3.succeed("ping -c3 10.0.100.2") + # allowFromLighthouse can ping the lighthouse and allowAny + allowFromLighthouse.succeed("ping -c3 10.0.100.1") + allowFromLighthouse.succeed("ping -c3 10.0.100.2") - # node4 can ping the lighthouse but not node2 or node3 - node4.succeed("ping -c3 10.0.100.1") - node4.fail("ping -c3 10.0.100.2") - node4.fail("ping -c3 10.0.100.3") + # block allowFromLighthouse <-> allowAny, and allowFromLighthouse -> allowAny should still work. + ${blockTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + ${allowTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") - # node2 can ping node3 now that node3 pinged it first - node2.succeed("ping -c3 10.0.100.3") - # node4 can ping node2 if node2 pings it first - node2.succeed("ping -c3 10.0.100.4") - node4.succeed("ping -c3 10.0.100.2") + # allowToLighthouse can ping the lighthouse but not allowAny or allowFromLighthouse + allowToLighthouse.succeed("ping -c3 10.0.100.1") + allowToLighthouse.fail("ping -c3 10.0.100.2") + allowToLighthouse.fail("ping -c3 10.0.100.3") + + # allowAny can ping allowFromLighthouse now that allowFromLighthouse pinged it first + allowAny.succeed("ping -c3 10.0.100.3") + + # block allowAny <-> allowFromLighthouse, and allowAny -> allowFromLighthouse should still work. + ${blockTrafficBetween "allowAny" "allowFromLighthouse"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + allowAny.succeed("ping -c10 10.0.100.3") + ${allowTrafficBetween "allowAny" "allowFromLighthouse"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + allowAny.succeed("ping -c10 10.0.100.3") + + # allowToLighthouse can ping allowAny if allowAny pings it first + allowAny.succeed("ping -c3 10.0.100.4") + allowToLighthouse.succeed("ping -c3 10.0.100.2") + + # block allowToLighthouse <-> allowAny, and allowAny <-> allowToLighthouse should still work. + ${blockTrafficBetween "allowAny" "allowToLighthouse"} + allowAny.succeed("ping -c10 10.0.100.4") + allowToLighthouse.succeed("ping -c10 10.0.100.2") + ${allowTrafficBetween "allowAny" "allowToLighthouse"} + allowAny.succeed("ping -c10 10.0.100.4") + allowToLighthouse.succeed("ping -c10 10.0.100.2") + + # block lighthouse <-> allowFromLighthouse and allowAny <-> allowFromLighthouse; allowFromLighthouse won't get to allowAny + ${blockTrafficBetween "allowFromLighthouse" "lighthouse"} + ${blockTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.fail("ping -c3 10.0.100.2") + ${allowTrafficBetween "allowFromLighthouse" "lighthouse"} + ${allowTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.succeed("ping -c3 10.0.100.2") + + # block lighthouse <-> allowAny, allowAny <-> allowFromLighthouse, and allowAny <-> allowToLighthouse; it won't get to allowFromLighthouse or allowToLighthouse + ${blockTrafficBetween "allowAny" "lighthouse"} + ${blockTrafficBetween "allowAny" "allowFromLighthouse"} + ${blockTrafficBetween "allowAny" "allowToLighthouse"} + allowFromLighthouse.fail("ping -c3 10.0.100.2") + allowAny.fail("ping -c3 10.0.100.3") + allowAny.fail("ping -c3 10.0.100.4") + ${allowTrafficBetween "allowAny" "lighthouse"} + ${allowTrafficBetween "allowAny" "allowFromLighthouse"} + ${allowTrafficBetween "allowAny" "allowToLighthouse"} + allowFromLighthouse.succeed("ping -c3 10.0.100.2") + allowAny.succeed("ping -c3 10.0.100.3") + allowAny.succeed("ping -c3 10.0.100.4") + + # block lighthouse <-> allowToLighthouse and allowToLighthouse <-> allowAny; it won't get to allowAny + ${blockTrafficBetween "allowToLighthouse" "lighthouse"} + ${blockTrafficBetween "allowToLighthouse" "allowAny"} + allowAny.fail("ping -c3 10.0.100.4") + allowToLighthouse.fail("ping -c3 10.0.100.2") + ${allowTrafficBetween "allowToLighthouse" "lighthouse"} + ${allowTrafficBetween "allowToLighthouse" "allowAny"} + allowAny.succeed("ping -c3 10.0.100.4") + allowToLighthouse.succeed("ping -c3 10.0.100.2") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix index 350486e8c7..b8d3ba75b5 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix @@ -26,4 +26,4 @@ foldl }; }) { } - [ 24 25 26 ] + [ 24 25 ] diff --git a/third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix b/third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix deleted file mode 100644 index 5aa17fcb5b..0000000000 --- a/third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix +++ /dev/null @@ -1,43 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: - # This is separate from pgadmin4 since we don't want both running at once - - { - name = "pgadmin4-standalone"; - meta.maintainers = with lib.maintainers; [ mkg20001 ]; - - nodes.machine = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - curl - ]; - - services.postgresql = { - enable = true; - - authentication = '' - host all all localhost trust - ''; - - ensureUsers = [ - { - name = "postgres"; - ensurePermissions = { - "DATABASE \"postgres\"" = "ALL PRIVILEGES"; - }; - } - ]; - }; - - services.pgadmin = { - enable = true; - initialEmail = "bruh@localhost.de"; - initialPasswordFile = pkgs.writeText "pw" "bruh2012!"; - }; - }; - - testScript = '' - machine.wait_for_unit("postgresql") - machine.wait_for_unit("pgadmin") - - machine.wait_until_succeeds("curl -s localhost:5050") - ''; - }) diff --git a/third_party/nixpkgs/nixos/tests/pgadmin4.nix b/third_party/nixpkgs/nixos/tests/pgadmin4.nix index 2a2b5aaa28..6a9ce6ceae 100644 --- a/third_party/nixpkgs/nixos/tests/pgadmin4.nix +++ b/third_party/nixpkgs/nixos/tests/pgadmin4.nix @@ -1,133 +1,57 @@ -import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: - /* - This test suite replaces the typical pytestCheckHook function in python - packages. Pgadmin4 test suite needs a running and configured postgresql - server. This is why this test exists. +{ + name = "pgadmin4"; + meta.maintainers = with lib.maintainers; [ mkg20001 gador ]; - To not repeat all the python dependencies needed, this test is called directly - from the pgadmin4 derivation, which also passes the currently - used propagatedBuildInputs and any python overrides. + nodes.machine = { pkgs, ... }: { - Unfortunately, there doesn't seem to be an easy way to otherwise include - the needed packages here. + imports = [ ./common/user-account.nix ]; - Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails - and needs to be called as "pgadmin4.tests" + environment.systemPackages = with pkgs; [ + curl + pgadmin4-desktopmode + ]; - */ - - let - pgadmin4SrcDir = "/pgadmin"; - pgadmin4Dir = "/var/lib/pgadmin"; - pgadmin4LogDir = "/var/log/pgadmin"; - - in - { - name = "pgadmin4"; - meta.maintainers = with lib.maintainers; [ gador ]; - - nodes.machine = { pkgs, ... }: { - imports = [ ./common/x11.nix ]; - # needed because pgadmin 6.8 will fail, if those dependencies get updated - nixpkgs.overlays = [ - (self: super: { - pythonPackages = pythonEnv; - }) + services.postgresql = { + enable = true; + authentication = '' + host all all localhost trust + ''; + ensureUsers = [ + { + name = "postgres"; + ensurePermissions = { + "DATABASE \"postgres\"" = "ALL PRIVILEGES"; + }; + } ]; - - environment.systemPackages = with pkgs; [ - pgadmin4 - postgresql - chromedriver - chromium - # include the same packages as in pgadmin minus speaklater3 - (python3.withPackages - (ps: buildDeps ++ - [ - # test suite package requirements - pythonPackages.testscenarios - pythonPackages.selenium - ]) - ) - ]; - services.postgresql = { - enable = true; - authentication = '' - host all all localhost trust - ''; - ensureUsers = [ - { - name = "postgres"; - ensurePermissions = { - "DATABASE \"postgres\"" = "ALL PRIVILEGES"; - }; - } - ]; - }; }; - testScript = '' + services.pgadmin = { + port = 5051; + enable = true; + initialEmail = "bruh@localhost.de"; + initialPasswordFile = pkgs.writeText "pw" "bruh2012!"; + }; + }; + + testScript = '' + with subtest("Check pgadmin module"): machine.wait_for_unit("postgresql") + machine.wait_for_unit("pgadmin") + machine.wait_until_succeeds("curl -s localhost:5051") + machine.wait_until_succeeds("curl -s localhost:5051/login | grep \"pgAdmin 4\" > /dev/null") - # pgadmin4 needs its data and log directories - machine.succeed( - "mkdir -p ${pgadmin4Dir} \ - && mkdir -p ${pgadmin4LogDir} \ - && mkdir -p ${pgadmin4SrcDir}" - ) - - machine.succeed( - "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}" - ) - - machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md") - - # set paths and config for tests - machine.succeed( - "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ - && cp -v web/regression/test_config.json.in web/regression/test_config.json \ - && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \ - && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \ - && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json" - ) - - # adapt chrome config to run within a sandbox without GUI - # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913 - # add chrome binary path. use spaces to satisfy python indention (tabs throw an error) - # this works for selenium 3 (currently used), but will need to be updated - # to work with "from selenium.webdriver.chrome.service import Service" in selenium 4 - machine.succeed( - "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ - && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \ - && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \ - && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \ - && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \ - && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py" - ) - - # Don't bother to test LDAP or kerberos authentication - with subtest("run browser test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && python regression/runtests.py \ - --pkg browser \ - --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking' - ) - - # fontconfig is necessary for chromium to run - # https://github.com/NixOS/nixpkgs/issues/136207 - with subtest("run feature test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \ - && python regression/runtests.py --pkg feature_tests' - ) - - with subtest("run resql test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && python regression/runtests.py --pkg resql' - ) - ''; - }) + # pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py + # pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file + # is owned by the user of the pgadmin module. With the check-system-config-dir.patch this will just throw a warning + # but will continue and not read the file. + # If we run pgadmin4-desktopmode as root (something one really shouldn't do), it can read the config file and fail, + # because of the wrong config for desktopmode. + with subtest("Check pgadmin standalone desktop mode"): + machine.execute("sudo -u alice pgadmin4 >&2 &", timeout=60) + machine.wait_until_succeeds("curl -s localhost:5050") + machine.wait_until_succeeds("curl -s localhost:5050/browser/ | grep \"pgAdmin 4\" > /dev/null") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/podman/default.nix b/third_party/nixpkgs/nixos/tests/podman/default.nix index c2ea399d65..c9b234d2b6 100644 --- a/third_party/nixpkgs/nixos/tests/podman/default.nix +++ b/third_party/nixpkgs/nixos/tests/podman/default.nix @@ -149,7 +149,6 @@ import ../make-test-python.nix ( docker.succeed(su_cmd("docker version")) with subtest("Run container via docker cli"): - docker.succeed("docker network create default") docker.succeed("tar cv --files-from /dev/null | podman import - scratchimg") docker.succeed( "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" @@ -158,7 +157,6 @@ import ../make-test-python.nix ( docker.succeed("podman ps | grep sleeping") docker.succeed("docker stop sleeping") docker.succeed("docker rm sleeping") - docker.succeed("docker network rm default") with subtest("A podman non-member can not use the docker cli"): docker.fail(su_cmd("docker version", user="mallory")) diff --git a/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix b/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix index 268a55701c..52c31dc21f 100644 --- a/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix +++ b/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix @@ -113,9 +113,6 @@ import ../make-test-python.nix ( podman.wait_for_unit("sockets.target") podman.wait_for_unit("ghostunnel-server-podman-socket.service") - with subtest("Create default network"): - podman.succeed("docker network create default") - with subtest("Root docker cli also works"): podman.succeed("docker version") diff --git a/third_party/nixpkgs/nixos/tests/vscodium.nix b/third_party/nixpkgs/nixos/tests/vscodium.nix index 37bb649889..3eda8b6cfb 100644 --- a/third_party/nixpkgs/nixos/tests/vscodium.nix +++ b/third_party/nixpkgs/nixos/tests/vscodium.nix @@ -33,13 +33,6 @@ let }; enableOCR = true; - # testScriptWithTypes:55: error: Item "function" of - # "Union[Callable[[Callable[..., Any]], ContextManager[Any]], ContextManager[Any]]" - # has no attribute "__enter__" - # with codium_running: - # ^ - skipTypeCheck = true; - testScript = '' @polling_condition def codium_running(): @@ -50,10 +43,10 @@ let machine.wait_for_unit('graphical.target') - codium_running.wait() - with codium_running: + codium_running.wait() # type: ignore[union-attr] + with codium_running: # type: ignore[union-attr] # Wait until vscodium is visible. "File" is in the menu bar. - machine.wait_for_text('Get Started') + machine.wait_for_text('Welcome') machine.screenshot('start_screen') test_string = 'testfile' diff --git a/third_party/nixpkgs/nixos/tests/zram-generator.nix b/third_party/nixpkgs/nixos/tests/zram-generator.nix index affa081bcc..3407361d28 100644 --- a/third_party/nixpkgs/nixos/tests/zram-generator.nix +++ b/third_party/nixpkgs/nixos/tests/zram-generator.nix @@ -1,18 +1,24 @@ import ./make-test-python.nix { name = "zram-generator"; - nodes.machine = { pkgs, ... }: { - environment.etc."systemd/zram-generator.conf".text = '' - [zram0] - zram-size = ram / 2 - ''; - systemd.packages = [ pkgs.zram-generator ]; - systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap + nodes.machine = { ... }: { + zramSwap = { + enable = true; + priority = 10; + algorithm = "lz4"; + swapDevices = 2; + memoryPercent = 30; + memoryMax = 10 * 1024 * 1024; + }; }; testScript = '' machine.wait_for_unit("systemd-zram-setup@zram0.service") - assert "zram0" in machine.succeed("zramctl -n") - assert "zram0" in machine.succeed("swapon --show --noheadings") + machine.wait_for_unit("systemd-zram-setup@zram1.service") + zram = machine.succeed("zramctl --noheadings --raw") + swap = machine.succeed("swapon --show --noheadings") + for i in range(2): + assert f"/dev/zram{i} lz4 10M" in zram + assert f"/dev/zram{i} partition 10M" in swap ''; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/airwave/default.nix b/third_party/nixpkgs/pkgs/applications/audio/airwave/default.nix index 6ed488d7d6..a57f43eea6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/airwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper -, qt5, requireFile, unzip, wine +{ lib, + stdenv, + multiStdenv, + fetchFromGitHub, + requireFile, + unzip, + wine, + cmake, + makeWrapper, + wrapQtAppsHook, + file, + libX11, + qt5 }: let @@ -13,11 +24,11 @@ let }; vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk368_08_11_2017_build_121"; + name = "vstsdk369_01_03_2018_build_132"; src = requireFile { name = "${name}.zip"; url = "http://www.steinberg.net/en/company/developers.html"; - sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70"; + sha256 = "0r29fv6yhm2m5yznn8m4my7fq01w1lpphax4sshagy6b1dgjlv3w"; }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; @@ -42,9 +53,18 @@ multiStdenv.mkDerivation { src = airwave-src; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + wrapQtAppsHook + ]; - buildInputs = [ file libX11 qt5.qtbase wine-xembed ]; + buildInputs = [ + file + libX11 + qt5.qtbase + wine-xembed + ]; postPatch = '' # Binaries not used directly should land in libexec/. diff --git a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix index b58dbddc81..15db4c1cf0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "14.0"; + version = "16.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urlj9XwMqKt5JvvsA1f7YpuLhQXMGxp0V1pGv+LTroE="; + sha256 = "sha256-jdeJ/VAJTDeiR9pyYps82F2Ty16r+a/FK+XV5L3rWco="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix b/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix index 276b3d6c7b..e48e27b5cc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix @@ -4,7 +4,6 @@ , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver, breeze-icons , curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras -, pmdk, numactl }: mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 08e3479119..0cb33062bd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,39 +1,67 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub -, qmake , pkg-config -, qttools +, qmake +, qt5compat ? null , qtbase +, qttools , rtaudio , rtmidi +, wrapQtAppsHook }: -mkDerivation rec { +assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; + +stdenv.mkDerivation rec { pname = "bambootracker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-yubaKTc8NFLxMY0/5c2VubRHgAGOsRlitmXJ1UHzl60="; + hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; }; - nativeBuildInputs = [ qmake qttools pkg-config ]; + postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' + # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path + # https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace BambooTracker/lang/lang.pri \ + --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' + ''; - buildInputs = [ qtbase rtaudio rtmidi ]; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; - qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; + buildInputs = [ + qtbase + rtaudio + rtmidi + ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ + qt5compat + ]; + + qmakeFlags = [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ]; postConfigure = "make qmake_all"; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix b/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix index 562a53fe59..221febf35d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-71+9ALz55aqxXRBRwOcs9fwiQK31pJ9E72pGRmt0OkE="; + sha256 = "sha256-BDEu3ASlnovMK0lQC+CQvpXvtdt33BRntstPAWaAnsg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix index 5611407cfe..7471a0afb4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix @@ -5,24 +5,27 @@ , glib , gobject-introspection , graphene +, gst_all_1 , gtk4 , lib , libadwaita +, libcanberra-gtk3 , pango , pkg-config +, sound-theme-freedesktop , withLibadwaita ? false , wrapGAppsHook4 }: buildGoModule rec { pname = "gtkcord4"; - version = "0.0.6"; + version = "0.0.8"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-uEG1pAHMQT+C/E5rKByflvL0NNkC8SeSPMAXanzvhE4="; + hash = "sha256-aJRVk9KFCJbIFInkg5BCJ6ygBlDCFF53WXO9qyACFus="; }; nativeBuildInputs = [ @@ -38,6 +41,14 @@ buildGoModule rec { graphene gtk4 pango + # Optional according to upstream but required for sound and video + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + libcanberra-gtk3 + sound-theme-freedesktop ] ++ lib.optionals withLibadwaita [ libadwaita ]; @@ -45,12 +56,12 @@ buildGoModule rec { tags = lib.optionals withLibadwaita [ "libadwaita" ]; postInstall = '' - install -D -m 444 -t $out/share/applications .nix/com.github.diamondburned.gtkcord4.desktop + install -D -m 444 -t $out/share/applications nix/xyz.diamondb.gtkcord4.desktop install -D -m 444 internal/icons/svg/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png ''; - vendorHash = "sha256-QZSjSk1xu5ZcrNEra5TxnUVvlQWb5/h31fm5Nc7WMoI="; + vendorHash = "sha256-usnlaOqyMd8rdnFpuCqfaCES8bPaB+NbdL4pFybKJbM="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 3ee546de22..005bef77d4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromGitLab , nix-update-script , meson , ninja @@ -9,7 +9,7 @@ , gst_all_1 , libhandy , libsecret -, libsoup +, libsoup_3 , appstream-glib , desktop-file-utils , totem-pl-parser @@ -25,16 +25,17 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.35"; + version = "1.4.37"; format = "other"; - doCheck = false; - src = fetchgit { - url = "https://gitlab.gnome.org/World/lollypop"; - rev = "refs/tags/${version}"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; fetchSubmodules = true; - sha256 = "sha256-Rdp0gZjdj2tXOWarsTpqgvSZVXAQsCLfk5oUyalE/ZA="; + sha256 = "sha256-3GPmGNbbSxvLq0t3F9q1x64BwNQCEvFQWLb0bSO9KUY="; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 libhandy - libsoup + libsoup_3 pango totem-pl-parser ] ++ lib.optional lastFMSupport libsecret; @@ -98,7 +99,6 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix index 88b5d3b74c..652adb03b6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix @@ -1,8 +1,9 @@ { stdenv, lib, fetchurl, undmg }: let - versionComponents = [ "3" "6" "2" "548020600" ]; + versionComponents = [ "4" "0" "1" ]; appName = "MuseScore ${builtins.head versionComponents}"; + ref = "230121751"; in stdenv.mkDerivation rec { @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; - sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; + url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.${ref}.dmg"; + hash = "sha256-tkIEV+tCS0SYh2TlC70/zEBUEOSg//EaSKDGA7kH/vo="; }; buildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix index 573a78a925..97f71a1b48 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -1,28 +1,35 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ninja , alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects +, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects, flac , qtquickcontrols2, qtscript, qtsvg, qttools -, qtwebengine, qtxmlpatterns +, qtwebengine, qtxmlpatterns, qtnetworkauth, qtx11extras , nixosTests }: mkDerivation rec { pname = "musescore"; - version = "3.6.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-GBGAD/qdOhoNfDzI+O0EiKgeb86GFJxpci35T6tZ+2s="; + sha256 = "sha256-Xhjjm/pYcjfZE632eP2jujqUAmzdYNa81EPrvS5UKnQ="; }; - patches = [ - ./remove_qtwebengine_install_hack.patch + # See https://github.com/musescore/MuseScore/issues/15571 + (fetchpatch { + url = "https://github.com/musescore/MuseScore/commit/365be5dfb7296ebee4677cb74b67c1721bc2cf7b.patch"; + hash = "sha256-tJ2M21i3geO9OsjUQKNatSXTkJ5U9qMT4RLNdJnyoKw="; + }) ]; cmakeFlags = [ "-DMUSESCORE_BUILD_CONFIG=release" + # Disable the _usage_ of the `/bin/crashpad_handler` utility. See: + # https://github.com/musescore/MuseScore/pull/15577 + "-DBUILD_CRASHPAD_CLIENT=OFF" + # Use our freetype "-DUSE_SYSTEM_FREETYPE=ON" ]; @@ -34,13 +41,13 @@ mkDerivation rec { "--set-default QT_QPA_PLATFORM xcb" ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ninja ]; buildInputs = [ alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio portmidi # tesseract + portaudio portmidi flac # tesseract qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 - qtscript qtsvg qttools qtwebengine qtxmlpatterns + qtscript qtsvg qttools qtwebengine qtxmlpatterns qtnetworkauth qtx11extras ]; passthru.tests = nixosTests.musescore; @@ -48,8 +55,11 @@ mkDerivation rec { meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; - license = licenses.gpl2; + license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever turion doronbehar ]; + # Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg + # file in ./darwin.nix in the meantime. platforms = platforms.linux; + mainProgram = "mscore"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/third_party/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch deleted file mode 100644 index 57a6092d58..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/main/CMakeLists.txt -+++ b/main/CMakeLists.txt -@@ -220,16 +219,0 @@ else (MINGW) -- ## install qwebengine core -- if (NOT APPLE AND USE_WEBENGINE) -- install(PROGRAMS -- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess -- DESTINATION bin -- ) -- install(DIRECTORY -- ${QT_INSTALL_DATA}/resources -- DESTINATION lib/qt5 -- ) -- install(DIRECTORY -- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales -- DESTINATION lib/qt5/translations -- ) -- endif(NOT APPLE AND USE_WEBENGINE) -- diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 706a36b532..35e86c28f6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.99.4"; + version = "0.99.5"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-GAO3CKtlZF8Ol4K+40lD8n2RtewiHj3f59d5RIatNws="; + sha256 = "sha256-SbWL36GRIJPSvxZyj6sebJxTkSPsUcsKyC3TmcIq2O0"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix new file mode 100644 index 0000000000..071a446843 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix @@ -0,0 +1,34 @@ +{ rustPlatform +, fetchFromGitHub +, pkg-config +, dbus +, protobuf +, lib +}: + +rustPlatform.buildRustPackage rec { + pname = "pbpctrl"; + + # https://github.com/qzed/pbpctrl/issues/4 + version = "unstable-2023-02-07"; + + src = fetchFromGitHub { + owner = "qzed"; + repo = "${pname}"; + rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6"; + hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA="; + }; + + cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA=="; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "Control Google Pixel Buds Pro from the Linux command line."; + homepage = "https://github.com/qzed/pbpctrl"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.vanilla ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index df008d1cfb..553ceb8be9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "9wkhSDn7kvj6pqCawTJDBO8HfYe8eEYtAR1Bi9/fxiOBXRYUUHEZzSGLF9QoTVYMuGGHeX35c+QvnA2VsdsWCw=="; + sha512 = "xGmE/ikL3ez0WTJKiOIcB5QtI7Ta9wq1Qedy9albWVpCS04FTnxQH5S0esTXw6j+iDTD8Lc2JbOhw8tYo/zRXg=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/48"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/49"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix index 528cc18cbe..576124d968 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix @@ -1,57 +1,59 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: +{ lib +, stdenv +, fetchFromGitHub +, electron +, copyDesktopItems +, makeDesktopItem +, makeWrapper +}: stdenv.mkDerivation rec { pname = "pocket-casts"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/felicianotech/pocket-casts-desktop-app/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-nHdF9RDOkM9HwwmK/axiIPM4nmKrWp/FHNC/EI1vTTc="; + src = fetchFromGitHub { + owner = "felicianotech"; + repo = "pocket-casts-desktop-app"; + rev = "v${version}"; + sha256 = "sha256-WMv2G4b7kYnWy0pz8YyI2eTdefs1mtWau+HQLiRygjE="; }; - nativeBuildInputs = [ - dpkg - autoPatchelfHook - makeWrapper + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Pocket Casts"; + genericName = "Podcasts Listener"; + exec = "pocket-casts"; + icon = "pocket-casts"; + comment = meta.description; + }) ]; - buildInputs = [ alsa-lib gtk3 libXScrnSaver libXtst mesa nss ]; - - unpackCmd = '' - # If unpacking using -x option, there is a permission error - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner; - ''; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; installPhase = '' runHook preInstall - mkdir -p $out - mv bin $out - mv lib $out - mv share $out + mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps - cp $out/lib/pocket-casts/resources/app/icon.png $out/share/pixmaps/pocket-casts.png + cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts + install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png + install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png + + makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ + --add-flags $out/opt/pocket-casts/main.js runHook postInstall ''; - postFixup = '' - substituteInPlace $out/share/applications/pocket-casts.desktop \ - --replace Name=pocket-casts "Name=Pocket Casts" \ - --replace GenericName=pocket-casts "GenericName=Podcasts App" \ - --replace Exec=pocket-casts Exec=$out/bin/pocket-casts - makeWrapper ${electron}/bin/electron \ - $out/bin/pocket-casts \ - --add-flags $out/lib/pocket-casts/resources/app/main.js - ''; - meta = with lib; { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 519f59a1d8..10eede334c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.05"; + version = "6.3.06"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw="; + sha256 = "sha256-KwJ8ia1yQmmG+N44ipvGCbuoR2cL03STSTKzUwlDqms="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix index 9fce777906..807a27e67e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix @@ -23,20 +23,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-N0ftIq0+sxkpo56IGHZYAK6MgRNW7T6C2jWEiJsYy/Y="; + sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-90JBN3cJKqIJX6DRq5FtEpIr5Isxf+jb1SlxGMbBwMQ="; + hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 558948ab4a..aef561e692 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-CCifn9OEFM//Hk1PJj8T3MXIV8pXCTdBBXPsHuZwLyQ="; + sha256 = "sha256-dlK1xQQqst4VQjioC7MZzqXwMC+JfqtvnD5lrOqGhYI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index b15031a529..93a66559bc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bHPWpx8EJibr2kNuzuGAQPZ0DE6qeJwIRYDy+NFS/PQ="; + sha256 = "sha256-iaDaPjh2wZXxBxBDhWp+hHrJZyXqw6HSzgCzbZj9iho="; }; - cargoSha256 = "sha256-QeQ3PYI5RmbJ+VQ9hLSTXgQXVVoID5zbRqSTrbWzVy8="; + cargoHash = "sha256-I8n/fR1aOsSex2p0u5FaqoJCh2J0oMxkikS9aynxgpA="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 69004bb73c..f0f5f50dfe 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; + sha256 = "sha256-bflQsVaCwV5zaU5k46wFQ45dIOg3dHmYfBVQHyw+EpM="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 8a05f8276b..3193a302d1 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.20"; sha256 = "1vnzmczd4z25vbf987p4vp6sxc09fp6mvhrvq41iwj1ks5zcprlf"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.25"; sha256 = "0172czzzlgsljgmhb5wh8cb1cl12ac54qyzmd3w18wbkxmr205qk"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.18"; sha256 = "0vnnnm9c5w8ag3a25fzmsjax028ykb7xr4fp7saq4si3bmzkjswp"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix index a17bef8cae..51b6d4d16b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.37.0"; + version = "2.38.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r/mumt/f0wrOsXyEHo/NX0lJGt8zqXEVNC+9DWDkHAM="; + sha256 = "sha256-sLJMmSEUQNsodZ9Ms0ipDwN2QOYa9pZTlEqt4CF23Sc="; fetchSubmodules = true; }; - vendorSha256 = "sha256-vSJZ1wIx1CiLE04ZBDnQDQqM2v8BBLxw5qbAsixC3/U="; + vendorSha256 = "sha256-KESY+PSbWQHPJphop4GnVF4T8Q/MPb2GFDEko0ieXEM="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 08def5dd79..00df022f47 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.57"; + version = "2.3.60"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; + sha256 = "sha256-YUZvTs77dGhG7dpxbQyGhrOMMx+8LotdMJflPflMDAE="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix index 4931ec5107..b58c6bddaf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.30.0"; + version = "1.30.1"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-Co8896RojUf/R8ZiRn7zSO1AWH7x5rYom6TbGohH1KM="; + sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY="; }; - cargoSha256 = "sha256-M+vhLBXsd+R97Sh5s6jFzon/47XohJeQKh//9QP6PXw="; + cargoHash = "sha256-5Gs1sAzjuUO3IkwMX1NeA/Sbax0qtwvulyT66AQaNjs="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix index 8f3fd4b1c8..9d984803d2 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.6.0"; + version = "19.7.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; + sha256 = "sha256-VfaP4EIVsu5JTAV7AX0Ymo44/TD8eUB61CViwf6Hfqw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix new file mode 100644 index 0000000000..f333fcd05d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, git +, gperf +, libmicrohttpd +, openssl +, readline +, zlib +}: + +stdenv.mkDerivation rec { + pname = "ton"; + version = "2023.01"; + + src = fetchFromGitHub { + owner = "ton-blockchain"; + repo = "ton"; + rev = "v${version}"; + sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8="; + fetchSubmodules = true; + }; + + postPatch = '' + # without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1' + substituteInPlace CMakeLists.txt \ + --replace 'set(TON_ARCH "apple-m1")' "" + ''; + + nativeBuildInputs = [ + cmake + git + ]; + + buildInputs = [ + gperf + libmicrohttpd + openssl + readline + zlib + ]; + + meta = with lib; { + description = "A fully decentralized layer-1 blockchain designed by Telegram"; + homepage = "https://ton.org/"; + license = licenses.lgpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix index cf7722238e..4b786168bc 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix @@ -1,9 +1,10 @@ { lib , buildGoModule +, buildNpmPackage , fetchFromGitHub }: -buildGoModule rec { +let pname = "torq"; version = "0.17.3"; @@ -14,6 +15,27 @@ buildGoModule rec { hash = "sha256-fqHJZi1NQCrZqsa+N+FVYZ8s9o0D555Sqn5qNlJ1MmI="; }; + web = buildNpmPackage { + pname = "${pname}-frontend"; + inherit version; + src = "${src}/web"; + npmDepsHash = "sha256-8mUfTFzPjQlQvhC3zZf+WruDBkYnmGt3yckNi0CPWs0="; + + # copied from upstream Dockerfile + npmInstallFlags = [ "--legacy-peer-deps" ]; + TSX_COMPILE_ON_ERROR="true"; + ESLINT_NO_DEV_ERRORS="true"; + + # override npmInstallHook, we only care about the build/ directory + installPhase = '' + mkdir $out + cp -r build $out/ + ''; + }; +in +buildGoModule rec { + inherit pname version src; + vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; subPackages = [ "cmd/torq" ]; @@ -24,6 +46,10 @@ buildGoModule rec { "-X github.com/lncapital/torq/build.version=v${version}" ]; + postInstall = '' + ln -s ${web} $out/web + ''; + meta = with lib; { description = "Capital management tool for lightning network nodes"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix index d4224893ba..61413a7bbc 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-iT7wdxHC+/3fvBbSrHHuqNYWiqwL48NYzFmtmgVaFik="; + hash = "sha256-CbTPJgnKMWMXdG6Hr8xT9ae4Q9MxAfhITn5WSCzCmI4="; }; buildInputs = [ pam libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index a57a3901f6..a0b0fa56de 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -103,7 +103,7 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + x86_64 = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw=="; }.${arch}; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 337370a6dd..d04e2507c9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.4"; + version = "43.6"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw="; + sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index b6d4e39f9f..0dc6e8297c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json @@ -27,10 +27,10 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "566eada40511cd06727d69047e8a6a1e75b06ebade93d1ea78262fc2715c8a38", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "f130d0e4c2c89dcd291e05cca33484eb08e247e9ec29c13deaf67176afbf6a36", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -59,10 +59,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "222e8cf974f70a77c92f03b34c38645bfe72a2dd4da20d7154f40375db54709b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "7592d18fa1e199087cfd661b64c2fad717840f8ff3e3faf4d88db58bdb397e03", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -92,18 +92,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4d2adb310b14fb38afcaa2da5c254c2fc0bede109e597eed6d3c36837497591f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "8c803914c55a3c1801ff9b619870d81597fabedbfb08a7c1aecf24f5d0884aea", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d78bd6494cced51fe77d87c07040fa3a29e8af917317399036af161c56afd927", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "2b612177c99ff0c6c542abe005846c3aa6cf170faa0202daafeb4ab1627c3794", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz", + "build_number": "223.8617.44" } }, "x86_64-darwin": { @@ -134,10 +134,10 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.3.1", - "sha256": "296d5da052b59a00b0930cf6eea07eb2e5ed4eb1417ee505b013c6d83ffda2e1", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.dmg", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "8e12ae0ee0d88cd716ac76a8a49392a51236287984d84c19324a19758fe8fc03", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -166,10 +166,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "a2ea7d0f1fd9810a46a3f3fea5f47475fe8b325514488f46ee4dace474388fa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.dmg", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "a2833c575cfa17c8d30a5f2e0d4ff06167372e7d8190ff08fc2f14e57a21396c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.dmg", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -199,18 +199,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.3.1", - "sha256": "3b23165c3ea9ef3d87233a64005bee4fbf98c99df5d60410a1418e022ce032d6", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.dmg", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "bea0a86a4ca00c08d78ccca7568ad5170798544c4a64b21bbfede126bdff0a99", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "ea2fb464cf8ba0bf553115cd0f006cb4dab729cbde941de2fc86588024abe8b9", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "87e716107156d15aa68230369b6eab2d25c5f6134cfe38cdb01e5b10f2a24418", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.dmg", + "build_number": "223.8617.44" } }, "aarch64-darwin": { @@ -241,10 +241,10 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "5873200406e91ca64df50470eb20f907c568f5d95b7488cb4c3b3d3eb8353df4", - "url": "https://download.jetbrains.com/go/goland-2022.3.1-aarch64.dmg", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "1df4707686f88e284e15a7fd63945b476dabf8e5a041894c281aba4838c603d9", + "url": "https://download.jetbrains.com/go/goland-2022.3.2-aarch64.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -273,10 +273,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "7658bcf3433d8f6b983136cc3f3edae5c02053d6983a59c273448f246ea3bcef", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "4e1244d7fa459a7f07ec43725ed4271e2c669c3202cc04cc074f11fb07bbb25e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -306,18 +306,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d0ec036ed67146beb46059a6ec9aa07d8caa2225e141183fe1d47e27170ad71a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1-aarch64.dmg", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "346b990c412f272acc2fc7e87448f456d8d6a1978b7a94eb645f9cea806b083c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "f63d2708cccc57bd404b782137f11e5dabf012df0c18aabf900743c4f02daa97", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "a869cd1c1c7b01bbd98f9a1cfd08b1b18ebe77f1c4422ee7e11ddc2c3cb250ce", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.44" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix index 23734f3f23..83d6796e68 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-eqiH/K8w0FZNHLBBMjiTSQjNQyONqcx3X+d85gPnFJg="; + hash = "sha256-ItJ8aX/WUfcAovxRsXXyWKBAI92hFloYIZiv7viPIdQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix index 29749c35db..8a4e86ef65 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix @@ -9,8 +9,6 @@ let inherit (neovimUtils) makeNeovimConfig; - packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - plugins = with vimPlugins; [ { plugin = vim-obsession; @@ -47,13 +45,6 @@ let nvimAutoDisableWrap = makeNeovimConfig { }; - nvimConfDontWrap = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - wrapNeovim2 = suffix: config: wrapNeovimUnstable neovim-unwrapped (config // { extraName = suffix; diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json index 09b5a7665d..0e0eb4b22d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.142.1", + "version": "3.144.3", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage", - "hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-x86_64.AppImage", + "hash": "sha512-NHuabqi8pjCnSI6EwhPLgWjyytW/ZnGvGCjb/hXscRVcJgJiQZ7FNZnnepFtZ3c0z0F4bM6AYcH+eWmt0ySgXw==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage", - "hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-arm64.AppImage", + "hash": "sha512-EaCq/0IgrSPWCkWtOBzMISfuajgGZKborPO4SoWi2QgMmwZXgLc/RBCVzVBT9C2EQLmc506IVrjOdAzkuQM5TQ==" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 96fb32e80f..d162261116 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.4.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-3w9JKX0tT5J3tJthIxJ+ZMlG8+gEeQAl9Gn+Zyjhmt4="; + hash = "sha256-QBPWelCqh8Ggp0IjH37QGYGu5Ya2fpsiSEkKh3Ee7PM="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 4279436804..343d6936c0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -197,12 +197,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-12-21"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "a2e7d6ebd26e647469135d4096dfa89da4f070e5"; - sha256 = "0jli6pba08n20n97h0wh6h36pkca9bwq93h9dipmb0q4a2zqb37m"; + rev = "91d86506ac2a039504d5205d32a1d4bc7aa57072"; + sha256 = "12hsdwj4jqbkh8z3hcr1c660jmh44c0j4rzlchnc326gcbrayarv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-01-30"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "d98828169af99624031d8535785a099cdf60d4c3"; - sha256 = "0j3lkz7lbd0naqqp6y2nlk9zawd453m41diia7f0saiyix76r6cp"; + rev = "5c5723bd464fd048f5d62fcf20c41495d3386a33"; + sha256 = "1vpay869faixkxpvxlwpk44pidjgnrhkchnchfsbd6c2brhgzz11"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-02-01"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "30a64f8590482dcd461123cb66464ff371aeeb84"; - sha256 = "15rzr9p685ylv37amkfv0finnimhzlp2lmzkm8gdqzl0xhsfa2rn"; + rev = "4428a478e70f6a6b52e86d16ced677020267f409"; + sha256 = "18dvm2k6h0xvzhf6wr317b9j85qq46gkh2scxmi8b20p8d3kfi52"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-29"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "116d713f63c7a81663fa53efa10e34649c9479e3"; - sha256 = "1hqlav8h09qffcicxjwzq74rm8b128jav1hgcyjv7jyz7f3fjcw4"; + rev = "45a3e3f574172028338de70ce8f8f606dec0a1b0"; + sha256 = "0xyglfdqr8bq4s5mqq7wvj8czl1n9pgs16368q2zjj9j35x6m8xr"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-01-31"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "a55448018d75817e820c03b21d28a2cd65b7d353"; - sha256 = "1vlbpw4mgkh5rd2mqwjsvz9sxnq5zjci4jddhmnmkilrlgancfg0"; + rev = "f7b2df980aa0518a1a208974dfcbc51ff91b531e"; + sha256 = "1d0p7d7kicqy4bbh3kaxn9as71afjljp38lhcc595l2b8nlaf2hc"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -785,6 +785,18 @@ final: prev: meta.homepage = "https://github.com/rmagatti/auto-session/"; }; + autoclose-nvim = buildVimPluginFrom2Nix { + pname = "autoclose.nvim"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "m4xshen"; + repo = "autoclose.nvim"; + rev = "5c63f2c28a48d556644f3650daccdf0ba03ea177"; + sha256 = "0c8klbm0wwr1rq1kkq2lq18n3d8kbi977zac70xc8h3dcfdnzc4m"; + }; + meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope.vim"; version = "2011-01-28"; @@ -847,12 +859,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "e3db3c4e25f5531bcb74b7951f52e425731433e5"; - sha256 = "0b69g3vr78x4hy5sj354iws43x4mm8qlqwfzl6cbiga16pa659ay"; + rev = "572e4070d1f26ce7252570823598a656e828a9ec"; + sha256 = "0k8mh345m8xxmss04zwscmpyfwxsa8pwd8pjklgv8njgxr5hk1hr"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1039,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-01-14"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "8d4ab7a8d9120a3538216056047d10df3947789b"; - sha256 = "0v6d2kiww9ky0m0b94c66kfvxwmv11rkpxqyfv62pigirs8x3a82"; + rev = "6004885c90fd0239b84ce242babbcfe7cd379535"; + sha256 = "0avpcl9y718xldlhc6ip8hq6y6wp50k4hqdfrm3zg1z6l7iladwh"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1303,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-01-31"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "06876deb8b82e2cc6a318f22196c39218f4f59bd"; - sha256 = "1m723a5qrs281n9sghmcgm8cnp9nrjxkaajnlq34bg3s56d32hik"; + rev = "5662ec89119c49a806b77b5df7517017abe47f8e"; + sha256 = "0md3msnkyw2dgkpgp12iskrdv7p4sywmdg4ifdmbcl56qn1dv5zr"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1471,12 +1483,12 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-10-14"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "d2768cb1b83de649d57d967085fe73c5e01f8fd7"; - sha256 = "13imcdv0yws084z2x2lmdj17zy4ngf126i7djknnwp2jfkca1120"; + rev = "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1"; + sha256 = "0bkviamzpkw6yv4cyqa9pqm1g2gsvzk87v8xc4574yf86jz5hg68"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; @@ -1747,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "80858aa01d57ed2f93c6bc388bad373810d41a21"; - sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9"; + rev = "9f702344b9550800e9ca928cd21fd6dcc8dffaef"; + sha256 = "10s0nqhybry6m6p13gvmchmc6in7zn7pgi1930svy7czqblcg6rw"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -2083,12 +2095,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-31"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "bfae743805d5f16fc31f6d3a8f2e46b3f3dbb175"; - sha256 = "1gkb9w1ad8fq6hbvr96p6sp1kzx8vlk0x6wy47mqbliqpxgp3vhr"; + rev = "a54e7b11a2c6efc9ddd3f42e56cf7d9eed1a9683"; + sha256 = "05bpgrq11zcp9flqp0gm0xjcaq622z46yjxlf6iliv8a4pmbrbgr"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2143,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-29"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "b6032a67b53ca92b7bda401ef45284e888c5f4b6"; - sha256 = "1wxwwnbbz25idi4bwqzb9byf44awss97ca1925n5gmxq19g7x1gc"; + rev = "d11f4eb12d73c5dcf5d6691378b18447446ec919"; + sha256 = "08kkp57k4138cb4jgv3q3x3h2qx7f29kr914lzqzrb7q4ybzm6b8"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2179,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-01-24"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "c2e9929c3ac40776c30bc7b328a7dff98756050a"; - sha256 = "1lqxbb6r49afqqc2gfxdim1kr3dww74gg1pbz26s6bqvga1wzf8s"; + rev = "1bca9122ddc4bf4c6573402bf6686fc084470a7e"; + sha256 = "0isvyph3lpqpijxpfj5rjfh1w1mh3629jpyahy5sj2g8hn46mj08"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2287,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "df68a1943ac2f08a73e3284b266ea50e7d381db4"; - sha256 = "1m2c7xqsb5fp41j0sbv7z5w34pi372x21gxifkvhx6znv4l5r9f7"; + rev = "d69d20170e12a20fa305e90870d6016e636cc328"; + sha256 = "18i9rjjv7g5hr1gyb98w3mh50m1iwk643rb93z1n7f38ln55xzw8"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2891,12 +2903,12 @@ final: prev: fcitx-vim = buildVimPluginFrom2Nix { pname = "fcitx.vim"; - version = "2022-11-15"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "dc95d0301b61a7db1f1badfe743fb627ea6e06d1"; - sha256 = "1z6n9ax8mnr9p1j64hrl463kqnaf7gc08975j5n7c77rrz23bd1q"; + rev = "92247352c6f05c8deebea2f50d8e842bfd91c294"; + sha256 = "01p7w8pc0d3crbksn5xwz4zcbnb7phjz5n6lk59v9b326sjm3rai"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; @@ -3048,12 +3060,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-01-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "ae0be3cef35c0cb41d6c7f814a19b3402d50fd7a"; - sha256 = "0ynidizghmbrapcm2wrn6cjmn28gvzkxc1ia9s8nmh63574prfrv"; + rev = "f84836a906fac21e9fb096ce15478051cd7df589"; + sha256 = "1j725v2cf9k1dlxnpmzcz1ys7v9iyj0vyvjw9bkmjvy17hqcrxaw"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3180,12 +3192,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-07-16"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "f8988d7d738a0e9e7aba2f0a9512df6356bbda07"; - sha256 = "1bl8a3mnz9p9a03pqq3gdxpfxk8j3pjj8g4828nca3df72nk9vrn"; + rev = "16905056051759b15a388709a3fa65ff098eb243"; + sha256 = "1330a2ycs9bz0kkkygbsri5fh9grldzkg5fwahv30vf3nsybsrpc"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -3196,8 +3208,8 @@ final: prev: src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "bc7fd1253aff19ae5514fc11b0f947cc4b052a90"; - sha256 = "1maddqgwdxxsp6ar6csbxsvd1ng3i3ybqdy4b2jslj9f8v54znds"; + rev = "5ad5771eb77d233ec7a4352240d2780dde8034d1"; + sha256 = "0fkwsi9f2qymgavfpgxzrbga1z0z0024sri1wslsp66g1512x92f"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3336,24 +3348,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-09-26"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "c68d4873a14d2ae614875685ccca2e49472989e8"; - sha256 = "1lr55vn4mr9gdhr1zxihm98hjv1ypp47k5vhq5fkv14sd37hmwf8"; + rev = "cc59f732f3d043b626c8702cb725c82e54d35c25"; + sha256 = "000gg83j6fcx6iwp39m3dljfpg0f5vna8pkvwp1b13jf4hjyzcff"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-01-27"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0d4fe37ba5285171f3729da955955205f3fa945b"; - sha256 = "0bpi4xhpi031sgrkxdqrrl7fk16wdkk1k7ln6b8qyf5vyhkcckfz"; + rev = "ec4742a7eebf68bec663041d359b95637242b5c3"; + sha256 = "18bwp15m2v4mrxp9i2vz061cfpv3ah08c8il3fx24aqhfbmaq6lz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3599,12 +3611,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-31"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "2e63d6336822a3676fdd27b0aa49cb2da08d1b17"; - sha256 = "0v4hc613smq1gry56imfy65cqy5128za4i5zfy1zvh3x1ppbqqvw"; + rev = "03dfa7fa3d08a34cdef09ca05a6da166a1ba22a2"; + sha256 = "166ar0qy3pl2jvw7y6im7v7gmrsji44ph1aahxqdpgbf170xx6pa"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3872,6 +3884,18 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; + indent-o-matic = buildVimPluginFrom2Nix { + pname = "indent-o-matic"; + version = "2023-01-24"; + src = fetchFromGitHub { + owner = "Darazaki"; + repo = "indent-o-matic"; + rev = "3103dde7a47f2855097558ab52162bbbdbe8dc40"; + sha256 = "1nfwzqki00x5vv75iawyky122v68qcajihfcdqxixlqln3srrmi4"; + }; + meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; version = "2022-09-07"; @@ -4211,12 +4235,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-01-19"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa"; - sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z"; + rev = "f565a9c4d92245d8b619235bebeaa73cc38aa40e"; + sha256 = "1i40bi18wn7vg6mdcg0xp5zxk960lzj4kzda3syj51sv1pgdq802"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4594,12 +4618,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-02-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c15369260448d81cb65e5c6965850232ed22fbbc"; - sha256 = "07s83hn47rnvb96fz7h9kxdy9qxmz7h0v23m0ij8c4yhk9z8xyxj"; + rev = "6f6252f63b0baf0f2224c4caea33819a27f3f550"; + sha256 = "01913fb3g3f8291fw48a3rlsr4wkn6imljpk0h60vg65d2xc15l3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4666,12 +4690,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-27"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "94f192cf5f0a1931b3035c2d8affdebec460968c"; - sha256 = "163zh6pq6a7qxs3yvkrpn5sihrbn1vhmr3jv27p4swkh2x3dn5q8"; + rev = "d404ec306bfa4cdb0c3605dbb17e8a93a9597337"; + sha256 = "1m6dmfplyln4xvc09srqxby93ksq1a62qai09j9msnd5pv4yqniy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4763,12 +4787,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "07de1d12940a6580c125720d37e26abc318f778a"; - sha256 = "19m2j1kmc0mnzbjyp266dqqgfp2fw1mlzcsc9286ggbbvgisadih"; + rev = "9ec92c1945b11ba7e7e6730fd60fd44525f24a25"; + sha256 = "0snf7j4x4cmwrw81bwm3fj8k07l8iriqwzc5c47bl2w94fpbynyc"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4835,12 +4859,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-31"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "8e007cf3ae8db59bd926a9fbaf7f0d25a7fe67ca"; - sha256 = "02pq68d5c3g009qsjsbns0bswg1riq61l8giykhg09r0lbj28zn1"; + rev = "33e76b0c22465de03906ebd00c01b64a04e495b3"; + sha256 = "0kxfwmvp7pgvqr6cqs6zf5dklq6n7vcgzr1dj435f8yg6zh90aah"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5195,12 +5219,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "9fb68ebc1b5632b2e3e93ddb5ad1985c75c59fbd"; - sha256 = "0p2n2k28z0qjdsiyxq0frfl7y6lvf96bl5c7w8zk0amvabkh23wf"; + rev = "de8dbd4ba6583619ed02323dbde737d586ba572f"; + sha256 = "1ms7chmmilq8slf659m8d45i39pllgng7a95fc20ykwbakhi8m9b"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5219,28 +5243,40 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-28"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "8fd21037453f4306f500e437c5cbdf6e8b6c2f99"; - sha256 = "0zxac4425677w3pvj5yp7sxllmnj4bhwc6kwwa6c409wvyzrfas2"; + rev = "70cab52c9d19e982f306716534e90c37a254b046"; + sha256 = "13xrc45s5fx8y2dl1ds155r5w0yrivq2b1aqvqjk7ywgyyq2wr5l"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-01-11"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "ec601d38a2e9309109f405ce038c5a6ce774f1a9"; - sha256 = "028xycbvjhs7mvnzlismjipibgqdhjm9s0asmjpg3g7y2qhkw3ix"; + rev = "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81"; + sha256 = "02f77wwhb1wfk9bcvy5mnc4r2rdgw6b3pdmacizmjnd1a9ajqysn"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; + neogen = buildVimPluginFrom2Nix { + pname = "neogen"; + version = "2023-01-16"; + src = fetchFromGitHub { + owner = "danymat"; + repo = "neogen"; + rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06"; + sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3"; + }; + meta.homepage = "https://github.com/danymat/neogen/"; + }; + neogit = buildVimPluginFrom2Nix { pname = "neogit"; version = "2023-01-31"; @@ -5303,12 +5339,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-01-29"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "b977fa0f2069ff71111237df07de2bdeeb2b7079"; - sha256 = "04r5pcdkvm9dgfsyhx0skf8nwyf790myrha7rjkqr9cpr707l6mj"; + rev = "ac8828369cb2a4b2e1e17e6b495645585ed2a37b"; + sha256 = "1ljyzvk3ff876sp4idfqq3ziqm7c6wc63kii3nsvh9i4m0w5i5af"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5543,12 +5579,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-02"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "5541d073b93a404445907e0aec3ebd9cf8914e53"; - sha256 = "0r4bbppp95rdhpz9j24w6smpzv891gk1ja6dis7j4gf3sra57hqy"; + rev = "c2db6cfd687df2fba323ba31ad0d862d6129f62c"; + sha256 = "0k7mhz2k05qwyrx9iyc9psjfshxzw8p1618fiyr7cck9aphzwqlf"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5651,12 +5687,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-31"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "c3e678110d5f31854c6575cf4bda3b82f3d4a884"; - sha256 = "045anxnny6rlfrj18wqqrdy69j0b6qpgiirabjas6hcyh3sjgrx6"; + rev = "8f5d730021497233c39d3adbf4b8043d4be163f8"; + sha256 = "0isrsbba9clpjjx5z37p4d0s8fasd7gxr1gxxjsvgkp2yn7blvi0"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5723,12 +5759,12 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-01-30"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "d41f301dcd3de51e95d5e1b7737e22a4e1eddd28"; - sha256 = "1dlxa4n0xv5zpkpvw06xvbmcyaghs5byrw9xkpv9m3wqk55x395d"; + rev = "a3e0146ba46a797a0118da0177cbec5e28722399"; + sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5783,12 +5819,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-01-26"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "e7e2ef7031db8e0cfad7ad9916ec766ddd9dbb3b"; - sha256 = "1jd1x6rg9k5gjwnlfrhmy976xky6sm7335hcz2lpgjapgy7rnyz7"; + rev = "cfafe0a1ca8933f7b7968a287d39904156f2c57d"; + sha256 = "1qgvlvjwah6581vppsb8racgkfjpjx2xqbk2ji1fmczc3rsk80h6"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6059,12 +6095,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-01-20"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; - sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; + rev = "1f640d14d17f20cfc63c1acc26a10f9466e66a75"; + sha256 = "1cfl5cjjfcijdsnbh1f23vp3msjlpkvr81am6lpkhx5as2dfws67"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6215,12 +6251,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-01-26"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a"; - sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq"; + rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6"; + sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6239,12 +6275,12 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2022-12-22"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8"; - sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227"; + rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16"; + sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -6335,12 +6371,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-01-11"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "24275beae382e6bd0180b3064cf5729548641a02"; - sha256 = "0rw2g0a1sdd92ac22rgmvb4yk17ps2c760g03pbdwfca14d50fnh"; + rev = "17b7c84ea8884bfec8e71b8021e924cb3a39c180"; + sha256 = "1r6jran2nqyzjgxmwnykd53k38iz8pdc5x9ndcqd8w88ybg3bbpd"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -6383,24 +6419,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-31"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "215b29bfad74518442621b9d0483a621483b066b"; - sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2"; + rev = "7eb33d2a6d5d574a43159da90e0eac2445367393"; + sha256 = "0x6lji8s86vgih7fv9yvvjkyh9bqlzrsmn04im1zif087wa1dcw1"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f0e083912ac42e9001e02a89f70269aa0698e9ec"; - sha256 = "0yd2rfy2vsrnnxz0ih8j1f975kww9xcdwzp7241dbdyvy9h7ra7d"; + rev = "bd7b4b6eff2dcb4a8a65f55d51398e79fa3d4ec6"; + sha256 = "08amxr13yfqi2301lrdb0swl6wfjkbi3i7cq5r5ypyw7xaj1nbqb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6491,23 +6527,23 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-01-19"; + version = "2023-02-04"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "2e0e2167f173df2f075fd52add2a0d6c66a2344a"; - sha256 = "0z5w6y6ynv4q8rjcrfi2vklf9l9h5azda73ragqbfijkx9ggniyy"; + rev = "7d33fb4402676723b0d7ca4d95717f5e020cd123"; + sha256 = "0h4kfmh75p6c00f1xa6609y7zq9nm3p0r8yj17bwy30hpi51vnqv"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-28"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "a421d183ef37dfa13f51a5805bed2381aebf9080"; - sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d"; + rev = "2b96193abe4372e18e4f4533895a42a466d53c17"; + sha256 = "18vh5xpyzlmfwdz2n30fi7a6v7w5mnami857cczqy2bk5bc1xdvd"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6598,12 +6634,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-29"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "716dd8f9cf1ff2b9cda03497025612ce3c366307"; - sha256 = "14qydwhkr90w2bb1xza44pm2d1iiqmvijqik8qjs122i6z5hc7c6"; + rev = "7371dd220f1d08789cc225846d8cafed938777e9"; + sha256 = "0rcx62q9vrx0w6qgkpz39173r0fba6xk9ja212s93l3zwqp49wwb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6611,12 +6647,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "omnisharp-extended-lsp.nvim"; - version = "2022-10-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "83be0f285afa360ca4a134820381e54b4b7aadd3"; - sha256 = "1hdsc68qzf4j83xah72yjan7mlsvdz7w310m1qw81yzd45z0scyd"; + rev = "55cb3d7310e07e38d0d420d195f353c51eb603fb"; + sha256 = "1wy2cpg4cb2f18751lxiy8lbhxmp17z9d01b7qwbz6pxyr4l6k2p"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -6659,12 +6695,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-24"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c3409eca73d2ae334935ca4afdb0428f453ba404"; - sha256 = "1zj4kp8ffhgq9syqh5w7rr5zzb92kvzdkcpf3x0v2d4cwxysd2ji"; + rev = "64d5c6d75c9769f8edca674138cf63e71efcf65b"; + sha256 = "1zacxqgrmbpnmx7xp99b9g1s348874i5vmf4dj3f9hxzawlqq351"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6731,12 +6767,12 @@ final: prev: oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-01-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "b58812cde84df6ec0c2f54e602d608d94a78ebef"; - sha256 = "0gk2j9dkdjdiagz49wxj0skm9w50fifl0xg2496rcdarvhh5lny7"; + rev = "f7b05feadc985f39639650067f1a333285cb4085"; + sha256 = "0pwk7g59cmfpnqvvflbxxknmy3hnp6g9rz5la1gs00n7391gmcqq"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -6863,12 +6899,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-01-24"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "c19bcfd6a3681bc876e1b861f6685bfc04972d0d"; - sha256 = "07vhiknf5gfd8rp6ynp9xq3rlc17b1sh322mlhg3976hl62lgs4f"; + rev = "c481c660fa903a0e295902b1765ecfbd6e76a556"; + sha256 = "0d30s2rnjdizy8mibxl7pw99ij8209k09myv03d2sqnzapgx28ib"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -6984,12 +7020,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2022-12-07"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "7af25a840d38dc6767c85edd1f35c1f835618071"; - sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9"; + rev = "9a01f01991ca52ae835da09f483aeeeb79639739"; + sha256 = "0ix3gxh1d3iw9zjmw41yc3fk2dxz5xi5j0l7bn4xv7shbdpki1la"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -7500,6 +7536,18 @@ final: prev: meta.homepage = "https://github.com/kovisoft/slimv/"; }; + smart-splits-nvim = buildVimPluginFrom2Nix { + pname = "smart-splits.nvim"; + version = "2022-12-21"; + src = fetchFromGitHub { + owner = "mrjones2014"; + repo = "smart-splits.nvim"; + rev = "fdd158ce7554dc830fb86e0fe952cd9476cdf726"; + sha256 = "17xjcfjfzmy4crs6ks8drdjcygdnri776gf3vmnssjyvmzab3mdl"; + }; + meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; + }; + smartpairs-vim = buildVimPluginFrom2Nix { pname = "smartpairs.vim"; version = "2018-01-01"; @@ -7863,12 +7911,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-01-18"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "9aa594704eb63b81477bf7547342a5cc4012ef80"; - sha256 = "058nwj9rin11p9ifcl50i6ys5fv4v80kml4gnxqq89cd52sz07mh"; + rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a"; + sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -8202,12 +8250,12 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-01-23"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "66feda7a276366edfc555cb0a7e56b8dd70aadc3"; - sha256 = "1n4ygj3jhgqfg7xrh3hd56x14yqk6rdy3099hy8azbrx40zx0zdw"; + rev = "28c0100c90dc200dd42471003d458fa8a2b71428"; + sha256 = "0sd914iybjxrvfmakzw8wb6k97sjvw1nnmfli7a0wvrrbak562rk"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8334,12 +8382,12 @@ final: prev: template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; - version = "2022-11-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "axelvc"; repo = "template-string.nvim"; - rev = "fa94fd309f511ac19bcba0b4390104520f07a08d"; - sha256 = "00q8f8v6zcs85iyv36byil0a9v20m7q7scmkx1231nq0z21kzadc"; + rev = "b97ee201fa2d5edced1c6dbaf432d00fec0468f1"; + sha256 = "0cygqc07grd55w4bk42qil80353fr7hf3f73mc9n2y43knijamf8"; }; meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; @@ -8539,12 +8587,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-01-13"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "a54e6c471ce1cd8ef8357e34598a28a955297131"; - sha256 = "07q90impvavl0vv2c89ckqm2g6b7yk5n4z8n1864pz1j6442vhda"; + rev = "19aad0f41f47affbba1274f05e3c067e6d718e1e"; + sha256 = "1zslvsdv6y15yiqjyq52mdib15rk7k7k2qg1shwxhjjipgzykvpl"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -8729,6 +8777,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; + unison = buildVimPluginFrom2Nix { + pname = "unison"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "unisonweb"; + repo = "unison"; + rev = "59acc0cbe429492a99bfebf2b783fc2fa3967f75"; + sha256 = "1nrpxprq1f2pp269nrx18avv7ghngqlr7rjahib91rgkvhw6k1x7"; + }; + meta.homepage = "https://github.com/unisonweb/unison/"; + }; + unite-vim = buildVimPluginFrom2Nix { pname = "unite.vim"; version = "2021-02-06"; @@ -9151,12 +9211,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "18b85395d32e235128b85a059dd60b562f9dbfe1"; - sha256 = "0212cazr83r9n07gmm0rbzp7mq0lh88iwbcqsdza3nw98rqp3i5z"; + rev = "038e3a6ca59f11b3bb6a94087c1792322d1a1d5c"; + sha256 = "0m59sij2y38sgcmzic3jxw08bwkycywkjxn906xgfkwn2rvhv8cv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -10087,12 +10147,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2022-08-17"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "4e5c8358d751625bb040b187b9fe430c2b769f0a"; - sha256 = "0vfkvq20kr6jbm526vkvyliv4zybha7jpp7iaimvw4zx1mjs5pih"; + rev = "43301cf9a0fafd78cec7c2e5b9c0e2cfd9436e8a"; + sha256 = "0lcgax5m1zmngdz5dk9lx89didicw831zgyyjx0w9iih6d9amj18"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -10483,12 +10543,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-01-15"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9e64fc1ab60b2e97d39410482b64289dbbaf4eda"; - sha256 = "01vj5c89g6fblrybx2f95ji9blcdjyqrr120qwbq9kawbgja1giy"; + rev = "58437d8250cc3355b565725073f51ff0ff77cea6"; + sha256 = "1fsrhyawry2m4dq7lrh1zvanxn2qi35lqg1al92w065sf62mds9z"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -11097,12 +11157,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-01-10"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "653fb20b4c0eedabdc5486719b571813d5c8878c"; - sha256 = "1y6hzjx4qknwvilqxshqgl8q6wy7ycabmlzy2kgww7257cxsan1x"; + rev = "9b18bd548ec1fd6e94b262b3af0d9fb337c0b1df"; + sha256 = "1paqjvvrcgngpggwa2a57d85xzvz5g5mk43bzn5fkgc1xfd77yv1"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -12512,6 +12572,30 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-smalls/"; }; + vim-smartbd = buildVimPluginFrom2Nix { + pname = "vim-smartbd"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "Industrial"; + repo = "vim-smartbd"; + rev = "62c267401f634d4f8f65933c812469610ba505ea"; + sha256 = "0a4ls93bgy5r7ar3r60zgdn2jzdkk10wrws14lw2xl8yg65rc0mg"; + }; + meta.homepage = "https://github.com/Industrial/vim-smartbd/"; + }; + + vim-smartbw = buildVimPluginFrom2Nix { + pname = "vim-smartbw"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "Industrial"; + repo = "vim-smartbw"; + rev = "8091e5e452f63b10d4c9eacf0cc84cba394148f7"; + sha256 = "08i8qyqahj2jv44pay7bi2dxajhsrx244i44v53y4iiddps6smxn"; + }; + meta.homepage = "https://github.com/Industrial/vim-smartbw/"; + }; + vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; version = "2022-06-10"; @@ -12995,12 +13079,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-01-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "6be01c509779b1c8a3d1747677a9203419bd11c2"; - sha256 = "17ifpbrcyfs8szdsk3j59916lsbal72mysk4ksgpw0q1paqzk75s"; + rev = "0dfb1bf84bf8899dc57ae1102605336b929898e7"; + sha256 = "1pyk4bf3mrmhylmmrxj0wlq145ilanmkiblyjmdl0imwn8m5jyl9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13149,6 +13233,18 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; + vim-visual-star-search = buildVimPluginFrom2Nix { + pname = "vim-visual-star-search"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-visual-star-search"; + rev = "7c32edb9e3c85d473d9be4dec721a4c9d5d4d69c"; + sha256 = "1g3n84bwvy2535n8xwh14j3s8n1jwvl577vigg8zsxxvhjzl878b"; + }; + meta.homepage = "https://github.com/bronson/vim-visual-star-search/"; + }; + vim-visualstar = buildVimPluginFrom2Nix { pname = "vim-visualstar"; version = "2015-08-27"; @@ -13524,12 +13620,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-01-30"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b8607084b324ab0c98892ca20f78433904aecef5"; - sha256 = "15n8mfiq8mxcjlp13mv17prdfc59cd2kqjsbk7wg89khhbg81sq3"; + rev = "8ef5b0d9b85e7bb57b00b4571db4804aec0e10eb"; + sha256 = "1nk85v06s4kybvnmh8raxcmj49snph4nsbfyizwcixwr592amcs1"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13933,12 +14029,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-02-02"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053"; - sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj"; + rev = "baae8d0a8afb062f5be6d83189e626dd74f41f98"; + sha256 = "024iis733yvvkqil2m0wxh7lpkz0j7ij2if4yds07izbyyrpdxg6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13957,12 +14053,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-09-12"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "96fdfff7dac84dda937d843a0aceb1c39acba761"; - sha256 = "1yms82s3iwis6lk5h1kapa9vlhlhbk1kqxlywlvvy6kz7d1iyvjj"; + rev = "89a044730bf5402c49db03475a9fa56782ca9d1c"; + sha256 = "0d7956wi0lcbimxbn5cmghw11vb8gfsg2pd6yr4xja6bb4ldlbrk"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -13981,12 +14077,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "f514660f65983d33613bf605bfd0adf583c06a8b"; - sha256 = "1xgkwfacglm3f96mvs5q799h5vxa7a0dsik562jzi20vhgm49x9x"; + rev = "9a7013874a9d5e0413039fc9ded613fcdbd59cbd"; + sha256 = "1n9dkd6wlghw1b011xnja2h36l68x5pi3cf7f4khw7zfk0f49r1k"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a6ef2653ea..80e960b640 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -60,23 +60,23 @@ }; bash = buildGrammar { language = "bash"; - version = "4488aa4"; + version = "7f9506c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; - hash = "sha256-QkH5rI9/7x6L7e3YIwDMdSbBHOGhhC6LTHfasS7wX9U="; + rev = "7f9506c34ab6a0f4e3e052b7a49cbeef91f71236"; + hash = "sha256-D9FesfedHnHWUcCIPGs72fpgeBO3xZ2rWTRDewa4qzM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; beancount = buildGrammar { language = "beancount"; - version = "c68ffc4"; + version = "f3741a3"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7"; - hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c="; + rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3"; + hash = "sha256-WtZ3FindaePKbtlnilK9KkOoPxBaxRKNVM+8D52DtBE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -135,6 +135,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; + chatito = buildGrammar { + language = "chatito"; + version = "3baf22e"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-chatito"; + rev = "3baf22e7e507cedf15d1dbc03df8afa50a625586"; + hash = "sha256-NsdkvMkrHfVakeYxPJfr4HOg5BlLB6OPFQeMseQQL/k="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; + }; clojure = buildGrammar { language = "clojure"; version = "262d6d6"; @@ -435,6 +446,17 @@ }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; + func = buildGrammar { + language = "func"; + version = "88ee7d0"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-func"; + rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa"; + hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-func"; + }; fusion = buildGrammar { language = "fusion"; version = "19db2f4"; @@ -448,12 +470,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "a8fa839"; + version = "4849e65"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; - hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo="; + rev = "4849e657b98945cd040ffa7fd833d6130259dbab"; + hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -569,6 +591,17 @@ }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; + gosum = buildGrammar { + language = "gosum"; + version = "68974b6"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-go-sum"; + rev = "68974b63c19dc6e27214a5c76b6e26c0c40fe5b7"; + hash = "sha256-Avk9nAICwy59VYIlLhp9FkozAna9kMwY60pAqKyJsK4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; + }; gowork = buildGrammar { language = "gowork"; version = "949a8a4"; @@ -637,12 +670,12 @@ }; help = buildGrammar { language = "help"; - version = "9dee68e"; + version = "8f75ef3"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; - hash = "sha256-6XYEC+wKrCbPtcdjFH1O0EdX84M+NpPfTO2tXGFkwtk="; + rev = "8f75ef3ec86bc315d5fdb939899b397289389181"; + hash = "sha256-zzD899bOSVn0/RCki6i8wHEQgaIrCurRw4AxnN3J+VA="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -813,12 +846,12 @@ }; julia = buildGrammar { language = "julia"; - version = "9d36818"; + version = "e2f449e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "9d368185be7e8139f2eda93d8b0acc2a54031718"; - hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc="; + rev = "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"; + hash = "sha256-ZXnEvHtheP8rI/lwPf94lVCF5S5rw38bewuZ0GHxjr8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -923,24 +956,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "63cda48"; + version = "abea13b"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "63cda483a37c91eae817f33bc55680f228845566"; - hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg="; + rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; + hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "63cda48"; + version = "abea13b"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "63cda483a37c91eae817f33bc55680f228845566"; - hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg="; + rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; + hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1291,12 +1324,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "7a1921b"; + version = "206c707"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; - hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo="; + rev = "206c7077164372c596ffa8eaadb9435c28941364"; + hash = "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -1401,12 +1434,12 @@ }; sql = buildGrammar { language = "sql"; - version = "286e10c"; + version = "c508e60"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1"; - hash = "sha256-sIZ6615ioSz2wzjQLxcMaXKxd17qGR6nFDMxuwOx0Z8="; + rev = "c508e6044adf4298d7b321f966c90cbe32d75d23"; + hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1606,12 +1639,12 @@ }; v = buildGrammar { language = "v"; - version = "7ef1f12"; + version = "719cf0c"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b"; - hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo="; + rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3"; + hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1717,12 +1750,12 @@ }; zig = buildGrammar { language = "zig"; - version = "d90d38d"; + version = "b0693dd"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; - hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; + rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077"; + hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 173a9f2eb6..0b02b1d9d8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -116,7 +116,7 @@ self: super: { - barbecue-nvim = super.vimshell-vim.overrideAttrs (old: { + barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; meta = { description = "A VS Code like winbar for Neovim"; @@ -991,6 +991,11 @@ self: super: { ''; }); + unison = super.unison.overrideAttrs (old: { + # Editor stuff isn't at top level + postPatch = "cd editor-support/vim"; + }); + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. propagatedBuildInputs = [ gnome.zenity ]; @@ -1193,7 +1198,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; }; in '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1cebfd2ddc..6552349d1e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -64,6 +64,7 @@ https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, +https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, @@ -324,6 +325,7 @@ https://github.com/nishigori/increment-activator/,, https://github.com/haya14busa/incsearch-easymotion.vim/,, https://github.com/haya14busa/incsearch.vim/,, https://github.com/lukas-reineke/indent-blankline.nvim/,, +https://github.com/Darazaki/indent-o-matic/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, @@ -440,6 +442,7 @@ https://github.com/folke/neoconf.nvim/,HEAD, https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, +https://github.com/danymat/neogen/,HEAD, https://github.com/TimUntersberger/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, @@ -630,6 +633,7 @@ https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, +https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, @@ -732,6 +736,7 @@ https://github.com/leafgarland/typescript-vim/,, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, @@ -1050,6 +1055,8 @@ https://github.com/tpope/vim-sleuth/,, https://github.com/jpalardy/vim-slime/,, https://github.com/mzlogin/vim-smali/,, https://github.com/t9md/vim-smalls/,, +https://github.com/Industrial/vim-smartbd/,HEAD, +https://github.com/Industrial/vim-smartbw/,HEAD, https://github.com/psliwka/vim-smoothie/,, https://github.com/bohlender/vim-smt2/,, https://github.com/justinmk/vim-sneak/,, @@ -1104,6 +1111,7 @@ https://github.com/hashivim/vim-vagrant/,, https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, +https://github.com/bronson/vim-visual-star-search/,HEAD, https://github.com/thinca/vim-visualstar/,, https://github.com/ngemily/vim-vp4/,HEAD, https://github.com/hrsh7th/vim-vsnip/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 9e4548ad0f..41666183ce 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -2580,8 +2580,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.15.0"; - sha256 = "sha256-YfcO/01nO+92xZEJgYyLYAkqXMqfV/QDkcN9Dnjp5ZA="; + version = "2.16.0"; + sha256 = "sha256-Qr4cYAEvAkvvE6KytVeInJzcMQJZqr/e/KPfelVzjUA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/lua/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/lua/default.nix index 529428de67..6c9c72ca60 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/lua/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/lua/default.nix @@ -1,6 +1,6 @@ { lib , vscode-utils -, sumneko-lua-language-server +, lua-language-server }: vscode-utils.buildVscodeMarketplaceExtension { @@ -14,7 +14,7 @@ vscode-utils.buildVscodeMarketplaceExtension { patches = [ ./remove-chmod.patch ]; postInstall = '' - ln -sf ${sumneko-lua-language-server}/bin/lua-language-server \ + ln -sf ${lua-language-server}/bin/lua-language-server \ $out/$installPrefix/server/bin/lua-language-server ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 1b4f4508fb..c2036566b3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -135,6 +135,9 @@ let # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg + + # see https://github.com/gentoo/gentoo/commit/4da5959 + chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper ''; inherit meta; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 1d684f3ee3..1e6195021c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5"; - x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4"; - aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6"; - aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk"; - armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7"; + x86_64-linux = "1b1xk4f736lxg7vsqhnra0x1vvb3x9fj7ijxqk5liz5pap18k1c8"; + x86_64-darwin = "1pi2kspq162aaj42ssmrf67bbdk4n0vx618z8avxnbx3wbcrsnap"; + aarch64-linux = "1j6qim8k94a2baj8w098l6x3i94n34g62c1brfmhha8fr48jzlir"; + aarch64-darwin = "0agl2n6ljd5rc5shypn5j1292pf673nhqhmwhg5bg9qsawar0ksf"; + armv7l-linux = "10k4pzp9lyn5g8frgixcx9jyixwckr1481d1npdzrgcdwfwrmf20"; }.${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.74.3"; + version = "1.75.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 0821971406..cd89ab7d78 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg"; - x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj"; - aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz"; - aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim"; - armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla"; + x86_64-linux = "1qayw19mb7f0gcgcvl57gpacrqsyx2jvc6s63vzbx8jmf5qnk71a"; + x86_64-darwin = "02z9026kp66lx6pll46xx790jj7c7wh2ca7xim373x90k8hm4kwz"; + aarch64-linux = "1izqhzvv46p05k1z2yg380ddwmar4w2pbrd0dyvkdysvp166y931"; + aarch64-darwin = "1zcr653ssck4nc3vf04l6bilnjdsiqscw62g1wzbyk6s50133cx8"; + armv7l-linux = "0n914rcfn2m9zsbnkd82cmw88qbpssv6jk3g8ig3wqlircbgrw0h"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.3.23010"; + version = "1.75.0.23033"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix index a97114a07a..d3d5f1e11f 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14637-c471120a8"; - rpcs3Version = "0.0.26-14637-c471120a8"; - rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2"; - rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5"; + rpcs3GitVersion = "14684-8652b7d35"; + rpcs3Version = "0.0.26-14684-8652b7d35"; + rpcs3Revision = "8652b7d358fe975242dd2c51c91fd2968e6bcb82"; + rpcs3Sha256 = "08cd082cih9pcppipkhid1x1s7bq4grsz0zfa1rlxkzw3lajxnrf"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix index ae38f5d332..ed9e24a910 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -4,7 +4,6 @@ autoconf, hexdump, perl, nixosTests, supportFlags, patches, - vkd3dArches, moltenvk, buildScript ? null, configureFlags ? [], mainProgram ? "wine" }: @@ -71,7 +70,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus - ++ lib.optional openalSupport pkgs.openal ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 @@ -82,7 +80,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional saneSupport pkgs.sane-backends ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional krb5Support pkgs.libkrb5 - ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio @@ -91,7 +88,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional usbSupport pkgs.libusb1 - ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav (gst-plugins-bad.override { enableZbar = false; }) ]) @@ -101,7 +97,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security - ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon + ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix index 37953f73c5..d3b285f36d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix @@ -18,7 +18,6 @@ gstreamerSupport ? false, cupsSupport ? false, dbusSupport ? false, - openalSupport ? false, openclSupport ? false, cairoSupport ? false, odbcSupport ? false, @@ -30,13 +29,11 @@ saneSupport ? false, gphoto2Support ? false, krb5Support ? false, - ldapSupport ? false, pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, vulkanSupport ? false, sdlSupport ? false, - vkd3dSupport ? false, usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", @@ -49,12 +46,12 @@ let wine-build = build: release: wineRelease = release; supportFlags = { inherit - cupsSupport gettextSupport dbusSupport openalSupport cairoSupport + cupsSupport gettextSupport dbusSupport cairoSupport odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport + v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; + sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; }; inherit moltenvk; }); diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix index 3b5aa19658..2672e75580 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix @@ -5,14 +5,11 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); - vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; }; - vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { pname = "wine"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; monos = [ mono ]; @@ -22,7 +19,6 @@ in with src; { pname = "wine64"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; monos = [ mono ]; @@ -35,7 +31,6 @@ in with src; { inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; geckos = [ gecko32 gecko64 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; monos = [ mono ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 0e8f129f91..0d7ac403ad 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -1,17 +1,17 @@ { pkgs ? import {} }: ## we default to importing here, so that you can use -## a simple shell command to insert new sha256's into this file +## a simple shell command to insert new hashes into this file ## e.g. with emacs C-u M-x shell-command ## ## nix-prefetch-url sources.nix -A {stable{,.mono,.gecko64,.gecko32}, unstable, staging, winetricks} # here we wrap fetchurl and fetchFromGitHub, in order to be able to pass additional args around it -let fetchurl = args@{url, sha256, ...}: - pkgs.fetchurl { inherit url sha256; } // args; - fetchFromGitHub = args@{owner, repo, rev, sha256, ...}: - pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; - fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: - pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; +let fetchurl = args@{url, hash, ...}: + pkgs.fetchurl { inherit url hash; } // args; + fetchFromGitHub = args@{owner, repo, rev, hash, ...}: + pkgs.fetchFromGitHub { inherit owner repo rev hash; } // args; + fetchFromGitLab = args@{domain, owner, repo, rev, hash, ...}: + pkgs.fetchFromGitLab { inherit domain owner repo rev hash; } // args; updateScriptPreamble = '' set -eou pipefail @@ -24,27 +24,27 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "7.0.1"; - url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz"; - sha256 = "sha256-gHyqeBIbFiUPJA0oKKB8pOPGCXOeVSTvD0z4muSagWw="; + version = "8.0"; + url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; + hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; + hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; }; gecko64 = fetchurl rec { version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; + hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "7.0.0"; + version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA="; + hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; patches = [ @@ -54,14 +54,14 @@ in rec { updateScript = writeShellScript "update-wine-stable" ('' ${updateScriptPreamble} - major=''${UPDATE_NIX_OLD_VERSION%.*} + major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_stable=$(get_latest_wine_version "$major.0") latest_gecko=$(get_latest_lib_version wine-gecko) # Can't use autobump on stable because we don't want the path # to become . if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then - set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" + set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" fi autobump stable.gecko32 "$latest_gecko" @@ -72,27 +72,27 @@ in rec { }; unstable = fetchurl rec { - # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.20"; - url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-dRt58itan3LJ7BX3VbALE9PtBz6RaMPvStq9nbN9DVA="; + # NOTE: Don't forget to change the hash for staging as well. + version = "8.1"; + url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; + hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; + hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; updateScript = writeShellScript "update-wine-unstable" '' ${updateScriptPreamble} - major=''${UPDATE_NIX_OLD_VERSION%.*} + major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_unstable=$(get_latest_wine_version "$major.x") latest_mono=$(get_latest_lib_version wine-mono) update_staging() { staging_url=$(get_source_attr staging.url) - set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" + set_source_attr staging hash "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" } autobump unstable "$latest_unstable" "" update_staging @@ -105,7 +105,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-yzZE06FBoPL65+m8MrKlmW5cSIcX3dZYAOY9wjEJaJw="; + hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -115,12 +115,12 @@ in rec { wayland = fetchFromGitLab rec { # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "7.20"; - sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY="; + version = "8.0"; + hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk="; domain = "gitlab.collabora.com"; owner = "alf"; repo = "wine"; - rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1"; + rev = "2f80bd757739f2dd8da41abceae6b87d2c568152"; inherit (unstable) gecko32 gecko64; @@ -135,7 +135,7 @@ in rec { if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') wayland_url=$(get_source_attr wayland.url) - set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" + set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" set_source_attr wayland rev "\"$latest_wayland_rev\"" fi @@ -146,7 +146,7 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases version = "20220411"; - sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; + hash = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/update-lib.sh b/third_party/nixpkgs/pkgs/applications/emulators/wine/update-lib.sh index 8192d3b5ab..8be2645415 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/update-lib.sh +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/update-lib.sh @@ -14,9 +14,9 @@ set_source_attr() { sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@") } -set_version_and_sha256() { +set_version_and_hash() { set_source_attr "$1" version "\"$2\"" - set_source_attr "$1" sha256 "\"$(to_sri "$3")\"" + set_source_attr "$1" hash "\"$(to_sri "$3")\"" } get_latest_wine_version() { @@ -39,7 +39,7 @@ autobump() { version=$(get_source_attr "$attr.version") if [[ "$version" != "$latest" ]]; then url=$(get_source_attr "$attr.url") - set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" + set_version_and_hash "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" [[ -z "$more" ]] || $more "$version" "$latest" fi } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix deleted file mode 100644 index 249cb27304..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: - -#TODO: unstable - -stdenv.mkDerivation rec { - pname = "vkd3d"; - version = "1.5"; - - src = fetchurl { - url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw="; - }; - - nativeBuildInputs = [ flex bison ]; - - buildInputs = [ vulkan-headers spirv-headers ] - ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; - homepage = "https://source.winehq.org/git/vkd3d.git"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ maintainers.marius851000 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix index 003b07cb97..c4c2d9e652 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jrP8V1EhHldliZEjiX55TJujc82ub46aWi1boJYDVTg="; + sha256 = "sha256-kXnI8a1nGKBDc+isv9RYvputKk+/FHmM9j+G4UnI5Z4="; }; buildInputs = [ libcap acl file readline ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix index 8b54d79622..d45e6a699a 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix @@ -6,7 +6,6 @@ , gpm , file , e2fsprogs -, libX11 , libICE , perl , zip @@ -17,6 +16,7 @@ , openssl , coreutils , autoSignDarwinBinariesHook +, x11Support ? true, libX11 # updater only , writeScript @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { gettext glib libICE - libX11 libssh2 openssl slang zip - ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ] ++ lib.optional x11Support [ libX11 ] + ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -66,12 +66,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/filemanager/ext.c \ --replace /bin/rm ${coreutils}/bin/rm - - substituteInPlace misc/ext.d/misc.sh.in \ - --replace /bin/cat ${coreutils}/bin/cat ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ diff --git a/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix b/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix new file mode 100644 index 0000000000..477dc400fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenvNoCC +, buildDotnetModule +, fetchFromGitHub +, fetchpatch +, dotnetCorePackages +, gtk4 +, libadwaita +, pkg-config +, wrapGAppsHook4 +, glib +, shared-mime-info +, python3 +, desktop-file-utils +, gdk-pixbuf +}: + +buildDotnetModule rec { + pname = "denaro"; + version = "2023.1.1"; + + src = fetchFromGitHub { + owner = "nlogozzo"; + repo = "NickvisionMoney"; + rev = version; + hash = "sha256-U6/laqmOS7ZUhgCCHggIn1U3GyQ/wy05XuCcqc7gtVQ="; + }; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + + projectFile = "NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj"; + nugetDeps = ./deps.nix; + executables = "NickvisionMoney.GNOME"; + + # Prevent installing native libraries for all platforms + dotnetBuildFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + dotnetInstallFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib # For glib-compile-resources + shared-mime-info # For update-mime-database + python3 + desktop-file-utils + gdk-pixbuf # Fixes icon missing in envs where GDK_PIXBUF_MODULE_FILE is not set + ]; + + postInstall = '' + sh NickvisionMoney.GNOME/install_extras.sh $out + desktop-file-edit $out/share/applications/org.nickvision.money.desktop \ + --set-key=Exec --set-value=$out/bin/NickvisionMoney.GNOME + ''; + + runtimeDeps = [ + gtk4 + libadwaita + glib # Fixes "Could not retrieve parent type - is the typeid valid?" + ]; + + meta = with lib; { + description = "Personal finance manager for GNOME"; + homepage = "https://github.com/nlogozzo/NickvisionMoney"; + mainProgram = "NickvisionMoney.GNOME"; + license = licenses.mit; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix b/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix new file mode 100644 index 0000000000..31bf0a76b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix @@ -0,0 +1,40 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.2.0"; sha256 = "1lvyw61kcjq9m6iaw7c7xfjk1b99ccsh79819qnigdi37p7dgb7y"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.2.0"; sha256 = "14jr3476h3lr3s0iahyf9in96631h7b8g36wpfgr0gz6snic6ch1"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.2.0"; sha256 = "0as1iknxx8vd5c0snf3bssij20fy74dbzaqbq60djf7v4c5q46nq"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.2.0"; sha256 = "19rh6mm2zxg46gdnizic4v6pmdk2hx25r4k12r8z4mkbmzpmcaaf"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.2.0"; sha256 = "11v4zplb7flh24vn1pralanzjm9jlnmx8r867ihvzj73mphmzs6m"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.2.0"; sha256 = "0489ba4gw6wq1ndlrhfi7pmnifvnhq52p0riih60lrhgi3664ybc"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.2.0"; sha256 = "0ms6gbrrinznhvs15mhfm3xh4zlqv5j4sw2zgajisiiprdzh2rcz"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.2.0"; sha256 = "17qk1zhvfmmywndv2n6d3hg0gs1cwmxlmsns5ink7g8prwfp0vpf"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.2.0"; sha256 = "0gkj37rrazksvyc4nq3scmch7mxlcj40w8kwsmfvmvyl58z2faq7"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.2.0"; sha256 = "0qxw84hl40rbgjcxwx4rhmi4dif519kbdypazl2laz14pirh0b8v"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.2.0"; sha256 = "1klskbfkaaqy5asy83hbgb64pziib63s6d0szx3i3z24ynwhqjp3"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.2.0"; sha256 = "03vp892bzy3nm5x35aqg8ripkw2n9gc86fqm3pr9fa1l88dhbqnl"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.2.0"; sha256 = "158bsyirbdzyxnyphgzl8p6mxw1f9xbjpd92aijxk4hwdjvgn9hn"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.1"; sha256 = "1abakjiljrh0jabdk2bdgbi7lwzrzxmkkd8p5sm67xm5f4ni8db5"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.1"; sha256 = "1vkgng2rmpmazklwd9gnyrdngjf2n8bdm2y55njzny2fwpdy82rq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "QuestPDF"; version = "2022.12.0"; sha256 = "0hkcw871jm77jqbgnbxixd5nxpxzzz0jcr61adsry2b15ymzmkb1"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) +] diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1f78d53985..a2e0130397 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.15"; + version = "3.22.16"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-0hly1yZ7NAcSe84XMwDlcmZPunPcNXYzvAhd0Z5rB0Q="; + hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index 1f05f8e9fa..a433cc6516 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -21,6 +21,7 @@ , libde265Support ? true, libde265 , fftw , ApplicationServices, Foundation +, testers }: let @@ -33,14 +34,14 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; version = "6.9.12-68"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; }; @@ -109,10 +110,13 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://legacy.imagemagick.org/"; changelog = "https://legacy.imagemagick.org/script/changelog.php"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; license = licenses.asl20; @@ -137,4 +141,4 @@ stdenv.mkDerivation rec { "CVE-2022-2719" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index d5d64aef6d..0ad5226133 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, python3 }: assert libXtSupport -> libX11Support; @@ -44,15 +45,15 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.0-57"; + version = "7.1.0-61"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = version; - hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8="; + rev = finalAttrs.version; + hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -122,15 +123,19 @@ stdenv.mkDerivation rec { done ''; - passthru.tests.version = - testers.testVersion { package = imagemagick; }; + passthru.tests = { + version = testers.testVersion { package = imagemagick; }; + inherit (python3.pkgs) img2pdf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ erictapen dotlambda ]; license = licenses.asl20; mainProgram = "magick"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index c26b2f46e7..5c5745646b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.8.10"; + version = "20.8.16"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626"; + sha256 = "sha256-FBnyogqf5BHLRInjJzC2dENnAwFcWMHDvJ+F0I3ffVg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix new file mode 100644 index 0000000000..8df8b76801 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, pkg-config +, meson +, ninja +, glib +, gobject-introspection +, libadwaita +, libxml2 +, librsvg +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "emblem"; + version = "1.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World/design"; + repo = pname; + rev = version; + sha256 = "sha256-kNPV1SHkNTBXbMzDJGuDbaGz1WkBqMpVgZKjsh7ejmo="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-yhXxlUOe+mWVpAEB0yN9m5S5yfNRrHnx7XHLXbbf1hc="; + }; + + nativeBuildInputs = [ + appstream-glib + glib + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + desktop-file-utils + libadwaita + librsvg + libxml2 + ]; + + meta = with lib; { + description = "Generate project icons and avatars from a symbolic icon"; + homepage = "https://gitlab.gnome.org/World/design/emblem"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix index a9b0001847..86d8de46f9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix @@ -2,7 +2,7 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl , openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -26,7 +26,7 @@ mkDerivation rec { buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix index 8da308ba61..400b5d262c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII="; + hash = "sha256-8HMaCO+v9PbkoS8Z1BmndiU7UmlG4TT0+bSESIwa3RM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ="; + hash = "sha256-rXAPILGzLZ3Ne4nhdaPZH1R2ezaF+D/P2t/Sod6nxo8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix index c6acd02a54..e9b24e4c61 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc="; + sha256 = "sha256-lyljfJ4RZETEED4bofC/Rq88PMNhoHO1kgHmmaXPuhM="; }; strictDeps = true; @@ -67,6 +67,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ paperdigits ]; platforms = platforms.linux; - broken = stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix b/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix index eb5649a322..86589606ef 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix @@ -97,7 +97,7 @@ mkDerivation rec { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; homepage = "https://apps.kde.org/kalendar/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ Thra11 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 3c08f1d8a9..27adbfff71 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.9.10" else "8.9.12-4.BETA"; + version = if channel == "stable" then "8.9.14" else "8.10.0-20.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-aoa00W5zvZQeHKd2Eqyrxl5Z1PwLMHc5lkMUskLiD74="; + sha256 = "sha256-rlLzPDPOmzamDnRxuvgrpAW0QrMINw/PsdLxOiBpMnA="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-Zt64UGKI3+DayS6XP7jTE+pxv52tUUZbUHiuzjcm1JI="; + sha256 = "sha256-hJTqFr6/KOl4C+1oyo/zrnCbqvRQin6HjyLKOppUl/M="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-sx9eASpMcgkIH1GRzJMqSQa5Y5GJlYU/20CZFyFK+OU="; + sha256 = "sha256-3/aiUj+WYZfPItYrYNQKsUSpkRTgOhyb8L5gURt1O74="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-Z1cEynO9iWZra542CVGmefrTNerMe13OcTAzWXNi8jI="; + sha256 = "sha256-n0xqD5WbcC9B6spisa5V7JJRXGZubBwzJFUS8edvz/Q="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-/WXaLINqLFLft+wrmr+fV0kM9qS5w4etFiGltnzoVdo="; + sha256 = "sha256-r2MRyw0dfD3vGnCcPW624K5rSaNSCjTVW4cWFgPAIaY="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-Zv9uHkFCZ0flBMAwQBjNhqFWhAXKyHBfZk733hbSag4="; + sha256 = "sha256-98sv4yLvLw8J5uQBB66qTV3lRWnyeZiifhEOW7shz8s="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-Vryk6nMQY+0NIgwJkZ2j3vrxyhrzxbe96jbyoNbPIR0="; + sha256 = "sha256-ezHk6OgUsmFfMfsY+yyWqn+6JgHSmpkFWGNCCaBv/Bo="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-74iOaNkuPRKUsTNNd7UTpy5ahjoMmxiNT84Op5ztRGk="; + sha256 = "sha256-JmCrEBucXGPpGbiKOxA8vu6bUVYsavfsYA5QY58Grnw="; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh new file mode 100755 index 0000000000..aab589fd37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq +#shellcheck shell=bash + +CURRENT_HASH="" + +print_hash() { + OS="$1" + CHANNEL="$2" + ARCH="$3" + VERSION="$4" + + if [[ "$OS" == "linux" ]]; then + if [[ "$ARCH" == "x86_64" ]]; then + EXT="x64.tar.gz" + else + EXT="arm64.tar.gz" + fi + URL="https://downloads.1password.com/${OS}/tar/${CHANNEL}/${ARCH}/1password-${VERSION}.${EXT}" + else + EXT="$ARCH.zip" + URL="https://downloads.1password.com/${OS}/1Password-${VERSION}-${EXT}" + fi + + CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash') + + echo "$CHANNEL ${ARCH}-${OS}: $CURRENT_HASH" +} + +if [[ -z "$STABLE_VER" ]]; then + echo "No 'STABLE_VER' environment variable provided, skipping" +else + print_hash "linux" "stable" "x86_64" "$STABLE_VER" + print_hash "linux" "stable" "aarch64" "$STABLE_VER" + print_hash "mac" "stable" "x86_64" "$STABLE_VER" + print_hash "mac" "stable" "aarch64" "$STABLE_VER" +fi + +if [[ -z "$BETA_VER" ]]; then + echo "No 'BETA_VER' environment variable provided, skipping" +else + print_hash "linux" "beta" "x86_64" "$BETA_VER" + print_hash "linux" "beta" "aarch64" "$BETA_VER" + print_hash "mac" "beta" "x86_64" "$BETA_VER" + print_hash "mac" "beta" "aarch64" "$BETA_VER" +fi diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix index ae4a49d7e3..5ec64fc0a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.29.1"; + version = "0.30.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-NyIAOkOX9s9dN6m/5hfMhy4tSENPCDk2w/F8z+J6qqk="; + sha256 = "sha256-LifJc5mLbnt5wBXGM1n1uice0B6mCY80LYf3kEFJy90="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix index c34872de4c..900653633a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -42,7 +42,8 @@ stdenv.mkDerivation rec { # Relative paths. "BINDIR=/bin" "PERLDIR=/share/perl5" - "MODSDIR=/lib/" + "MODSDIR=/nonexistent" # AMC will test for that dir before + # defaulting to the "portable" strategy, so this test *must* fail. "TEXDIR=/tex/latex/" # what texlive.combine expects "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? "MAN1DIR=/share/man/man1" diff --git a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix index 343848e673..2d719e321f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix @@ -38,9 +38,13 @@ in pythonPackages.buildPythonApplication rec { patches = [ (fetchpatch { - url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch"; + url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch"; sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv"; }) + (fetchpatch { + url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch"; + sha256 = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI="; + }) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix index 3912e8d221..f6035b3c6c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; + sha256 = "sha256-pA+SWktSjgH7lRqK14yJX2ziLoKpxMCpEIh0H6slpxw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix index fa6825bf9d..866ed16d44 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix @@ -45,6 +45,11 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + preConfigure = '' + # app bundle for macos + substituteInPlace src/diffuse/meson.build data/icons/meson.build --replace "/Applications" "$out/Applications"; + ''; + mesonFlags = [ "-Db_ndebug=true" ]; @@ -63,6 +68,6 @@ python3.pkgs.buildPythonApplication rec { description = "Graphical tool for merging and comparing text files"; license = licenses.gpl2; maintainers = with maintainers; [ k3a ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 5cae20d831..40f67c02c7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -7,16 +7,7 @@ , zbar , secp256k1 , enableQt ? true -# for updater.nix -, writeScript -, common-updater-scripts -, bash -, coreutils -, curl -, gnugrep -, gnupg -, gnused -, nix +, callPackage }: let @@ -125,20 +116,7 @@ python3.pkgs.buildPythonApplication { $out/bin/electrum help >/dev/null ''; - passthru.updateScript = import ./update.nix { - inherit lib; - inherit - writeScript - common-updater-scripts - bash - coreutils - curl - gnupg - gnugrep - gnused - nix - ; - }; + passthru.updateScript = callPackage ./update.nix { }; meta = with lib; { description = "Lightweight Bitcoin wallet"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index e4a5e3dd91..fef4f8ce78 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.35"; + version = "6.4.36"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE="; + sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo="; }; buildInputs = [ openssl python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 27e3ea0ace..457f8b14de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis="; + sha256 = "sha256-ewffAfB9Lsac6ivHxI1obAxByk5wNNJjqrYmYL2xCr4="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix new file mode 100644 index 0000000000..14bc6ad012 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libgpiod +, cmake +}: + +stdenv.mkDerivation rec { + pname = "gcfflasher"; + version = "4.0.3-beta"; + + src = fetchFromGitHub { + owner = "dresden-elektronik"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-m+iDBfsHo+PLYd3K8JaKwhIXcnj+Q8w7gIgmHp+0plk="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'main_windows.c' 'main_posix.c' + ''; + + buildInputs = lib.optionals stdenv.isLinux [ + libgpiod + ]; + + installPhase = '' + runHook preInstall + install -Dm0755 GCFFlasher $out/bin/GCFFlasher + runHook postInstall + ''; + + meta = with lib; { + description = "CFFlasher is the tool to program the firmware of dresden elektronik's Zigbee products"; + license = licenses.bsd3; + homepage = "https://github.com/dresden-elektronik/gcfflasher"; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index a03107c2af..e71daa754a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.11"; + version = "11.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-5kT1vcbCc0Fa3ylrcQetth50IQu57upiWRRpub93jlE="; + hash = "sha256-W35KBPYvTKrSi7UnzcUz8MsUwoq8rY5g/+hL1/gVpbI="; }; patches = (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix deleted file mode 100644 index d923dc9bfe..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv -, rustPlatform -, fetchFromGitHub -, llvmPackages -, openssl -, pkg-config -, installShellFiles -, Security -, gitMinimal -, util-linuxMinimal -}: - -rustPlatform.buildRustPackage rec { - pname = "imag"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "matthiasbeyer"; - repo = pname; - rev = "v${version}"; - sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; - }; - - nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; - nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; - - cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; - - checkPhase = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - - # UI tests uses executables directly, so we need to build them before - # launching the tests - cargo build - '' + ( - # CLI uses the presence of a controlling TTY to check if arguments are - # passed in stdin, or in the command-line, so we use script to create - # a PTY for us. - if !stdenv.isDarwin then '' - script -qfec "cargo test --workspace" - '' else '' - script -q "cargo test --workspace" - '' - ); - - postInstall = '' - installShellCompletion target/imag.{bash,fish} --zsh target/_imag - ''; - - meta = with lib; { - description = "Commandline personal information management suite"; - homepage = "https://imag-pim.org/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ Br1ght0ne minijackson ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix index 4a3262efa4..8241c3e98c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix @@ -1,37 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, meson +, ninja +, pkg-config +, cli11 +, hidrd +, inih +, microsoft_gsl +, spdlog +, systemd +}: stdenv.mkDerivation rec { pname = "iptsd"; - version = "0.5.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-du5TC3I5+hWifjdnaeTj2QPJ6/oTXZqaOrZJkef/USU="; + hash = "sha256-B5d1OjrRB164BYtFzZoZ3I4elZSKpHg0PCBiwXPnqLs="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + cmake + meson + ninja + pkg-config + ]; - buildInputs = [ systemd inih ]; + dontUseCmakeConfigure = true; + + buildInputs = [ + cli11 + hidrd + inih + microsoft_gsl + spdlog + systemd + ]; # Original installs udev rules and service config into global paths postPatch = '' - substituteInPlace meson.build \ - --replace "install_dir: unitdir" "install_dir: datadir" \ - --replace "install_dir: rulesdir" "install_dir: datadir" \ + substituteInPlace etc/meson.build \ + --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ + --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/udev/50-ipts.rules \ + --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" ''; + mesonFlags = [ "-Dservice_manager=systemd" "-Dsample_config=false" - "-Ddebug_tool=false" + "-Ddebug_tools=" + "-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ... ]; meta = with lib; { + changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ tomberek ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tomberek dotlambda ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix deleted file mode 100644 index 69092b3acd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "kanboard"; - version = "1.2.26"; - - src = fetchFromGitHub { - owner = "kanboard"; - repo = "kanboard"; - rev = "v${version}"; - sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/kanboard - cp -rv . $out/share/kanboard - ''; - - meta = with lib; { - description = "Kanban project management software"; - homepage = "https://kanboard.org"; - license = licenses.mit; - maintainers = with maintainers; [ lheckemann ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix index 283f386574..a0034d203c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix @@ -15,14 +15,14 @@ let }; in buildNpmPackage rec { pname = "kaufkauflist"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; - hash = "sha256-feqk2FUs3lcnIgyPzhsow+xO9u7l9+9eZEk9jxRlpG4="; + hash = "sha256-oXrb6n1oD27bHt/zPWP0REQyCyZXI8BB57pdR/q42gY="; }; npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index e062c35e80..d91f03a696 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.52"; + version = "2.53"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; + hash = "sha256-wpXbLH9VyjJyb+KuQ8xmbik1jq+xqAFRxsxAuLM5MI0="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 0386b25ee4..4348afb020 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.3"; + version = "0.28.5"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; + hash = "sha256-fjKxQ3oVtnFwzLeeE6kN0jKE5PIfBZubTF54KO+k/DE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix index b1d3a5c0d6..443a03c2ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { src = ./fix-build-bash.patch; }); - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml ]; + buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix index 582d3186ea..89179b88a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mediaelch"; - version = "2.8.18"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "sha256-9kwU9j8YNF/OmzrQaRAlBpW+t/tIpZJw5+pfEoTmCBA="; + sha256 = "sha256-hipOOG+ibfsJZKLcnB6a5+OOvSs4WUdpEY+RiVKJc+k="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index 1525fb86f8..f51d9a329c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.00.1"; + version = "1.01.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; + sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; }; outputs = [ "out" "udev" ]; @@ -40,7 +40,7 @@ mkDerivation rec { ''; homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; - maintainers = [ maintainers.kirikaza ]; + maintainers = with maintainers; [ kirikaza hughobrien ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 7724976eba..f5ac2ed7e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.7.11"; + version = "0.7.16"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Esr1OPyQCCQIOfgkl6RIn93ZaJkF0O2RM9ObIgBlPi4="; + sha256 = "sha256-dwnDrFQZVz6Vxa8bX0gFPBZFQwRJ3+wUy6Rsxvb2dhw="; }; # No tests @@ -56,6 +56,6 @@ python3Packages.buildPythonApplication rec { description = "GTK3-based panel for Sway window manager"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ berbiche ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 45ca034b74..f7b902cf54 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_21 +, electron , makeDesktopItem , graphicsmagick , writeScript @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_21}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -m 444 -D resources/app.asar $out/share/obsidian/app.asar diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 12d0a5e38f..4ca54221c2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -28,6 +28,17 @@ let sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew="; }; }); + flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = super.fetchPypi { + pname = "Flask-Babel"; + inherit version; + sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0="; + }; + nativeBuildInputs = [ ]; + format = "setuptools"; + outputs = [ "out" ]; + }); } ) # Built-in dependency diff --git a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix index ffb62dd6c1..a7366d6136 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix @@ -19,7 +19,8 @@ ocamlPackages.buildDunePackage rec { substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out ''; - buildInputs = with ocamlPackages; [ curses camlp5 num gsl ]; + nativeBuildInputs = [ ocamlPackages.camlp5 ]; + buildInputs = with ocamlPackages; [ curses num gsl ]; meta = { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix index 56490754e1..ba8324a02f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.2.1"; + version = "0.2.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-CsfzQN7n/LsNIivJShDG02cHwPktkXl/0udBSPz0i2U="; + sha256 = "sha256-J+3wi1nqkxR3ZDfR+F3rvFjUz1DJ7/jhjmcvFdMzWYc="; }; - cargoHash = "sha256-FSuhG+ZSQzwj1YB3xs3A1uFWPhwK8FIfVfUY9V/J2Z8="; + cargoHash = "sha256-oQPCUm/X2vt6wN5AKhtgq8tzQQrp0H42bBK7Az+I9BE="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index cf8e9978c9..91f2db2a28 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.3.4"; + version = "5.0.2"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-DYCiK5DgWTu1cm4TRsGDCB3LzVCGVkVzSlG3Jeo2WVI="; + hash = "sha256-+nBLmbu1aRnfWYNhTBUJdRmdlud8FK7LZFvDNFDrhiI="; }; unpackPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; preFixup = '' - gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}") + gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}") ''; installPhase = '' @@ -40,14 +40,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://github.com/torakiki/pdfsam"; - description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.agpl3; - platforms = platforms.all; - maintainers = with maintainers; [ _1000101 ]; + homepage = "https://github.com/torakiki/pdfsam"; + description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 96cc51fceb..1b42cd46a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs="; + sha256 = "sha256-aDmaKf3iLBFD28n2u/QOf/GkgE64Birn0x3Kj5Qx2sg="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix new file mode 100644 index 0000000000..ca4a1742e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix @@ -0,0 +1,60 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, fd +, libqalculate +}: + +rustPlatform.buildRustPackage rec { + pname = "pop-launcher"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "launcher"; + rev = version; + sha256 = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; + }; + + postPatch = '' + substituteInPlace src/lib.rs \ + --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" + substituteInPlace plugins/src/scripts/mod.rs \ + --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" + substituteInPlace plugins/src/calc/mod.rs \ + --replace 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")' + substituteInPlace plugins/src/find/mod.rs \ + --replace 'spawn("fd")' 'spawn("${fd}/bin/fd")' + substituteInPlace plugins/src/terminal/mod.rs \ + --replace '/usr/bin/gnome-terminal' 'gnome-terminal' + ''; + + cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; + + cargoBuildFlags = [ "--package" "pop-launcher-bin" ]; + + postInstall = '' + mv $out/bin/pop-launcher{-bin,} + + plugins_dir=$out/share/pop-launcher/plugins + scripts_dir=$out/share/pop-launcher/scripts + mkdir -p $plugins_dir $scripts_dir + + for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do + mkdir $plugins_dir/$plugin + cp plugins/src/$plugin/*.ron $plugins_dir/$plugin + ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/') + done + + for script in scripts/*; do + cp -r $script $scripts_dir + done + ''; + + meta = with lib; { + description = "Modular IPC-based desktop launcher service"; + homepage = "https://github.com/pop-os/launcher"; + license = licenses.mpl20; + maintainers = with maintainers; [ samhug ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index b45854a6d1..2af5e9d692 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -1,9 +1,13 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39, fetchpatch +, python310, fetchpatch }: let - python3' = python39.override { + dropDevOutput = { outputs, ... }: { + outputs = lib.filter (x: x != "doc") outputs; + }; + + python3' = python310.override { packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; @@ -25,6 +29,15 @@ let sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; }; }); + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { + version = "2.5.1"; + format = "setuptools"; + src = self.fetchPypi { + pname = "Flask-SQLAlchemy"; + inherit version; + hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; + }; + }); # Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708 werkzeug = super.werkzeug.overridePythonAttrs (old: rec { version = "1.0.1"; @@ -44,6 +57,19 @@ let inherit version; sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; + patches = [ + # python 3.10 compat fixes. In later upstream releases, but these + # are not compatible with flask 1 which we need here :( + (fetchpatch { + url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; + sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; + }) + (fetchpatch { + url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; + sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; + excludes = [ "CHANGES.rst" ]; + }) + ]; }); # Required by jinja2-2.11.3 markupsafe = super.markupsafe.overridePythonAttrs (old: rec { @@ -84,18 +110,62 @@ let nativeCheckInputs = []; doCheck = false; }); + # Requires pytest-httpserver as checkInput now which requires Werkzeug>=2 which is not + # supported by current privacyIDEA. + responses = super.responses.overridePythonAttrs (lib.const { + doCheck = false; + }); + flask-babel = (super.flask-babel.override { + sphinxHook = null; + furo = null; + }).overridePythonAttrs (old: (dropDevOutput old) // rec { + pname = "Flask-Babel"; + version = "2.0.0"; + format = "setuptools"; + src = self.fetchPypi { + inherit pname; + inherit version; + hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + }; + }); + psycopg2 = (super.psycopg2.override { + sphinxHook = null; + sphinx-better-theme = null; + }).overridePythonAttrs dropDevOutput; + hypothesis = super.hypothesis.override { + enableDocumentation = false; + }; + pyjwt = (super.pyjwt.override { + sphinxHook = null; + sphinx-rtd-theme = null; + }).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; }); + beautifulsoup4 = (super.beautifulsoup4.override { + sphinxHook = null; + }).overridePythonAttrs dropDevOutput; + pydash = (super.pydash.override { + sphinx-rtd-theme = null; + }).overridePythonAttrs (old: rec { + version = "5.1.0"; + src = self.fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; + }; + format = "setuptools"; + doCheck = false; + }); }; }; in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.4"; + version = "3.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo="; + sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; @@ -104,17 +174,7 @@ python3'.pkgs.buildPythonPackage rec { defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt - ]; - - patches = [ - # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes - # `Exceeds the limit (4300) for integer string conversion` in the tests, - # see https://hydra.nixos.org/build/192932057 - (fetchpatch { - url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch"; - sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ="; - }) + pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno ]; passthru.tests = { inherit (nixosTests) privacyidea; }; @@ -128,6 +188,7 @@ python3'.pkgs.buildPythonPackage rec { # Tries to connect to `fcm.googleapis.com`. "test_02_api_push_poll" + "test_04_decline_auth_request" # Timezone info not available in build sandbox "test_14_convert_timestamp_to_utc" diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix index f71841c1af..15aa7d2d1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-8gyALVW+ort76r/zevWAhZlJ/fg5DBmwUNvjZ21wWKY="; + hash = "sha256-riYrvg83mNdj4W8o/2cdZO+zie/WB+HVWXORJ4Uo/CE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix index 1d6373592f..c840bbfe5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix @@ -20,7 +20,8 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; - buildInputs = [ fmt lwt_ppx menhir ocf_ppx ppx_blob xtmpl_ppx ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ dune-build-info dune-site diff --git a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix index 6b23e2d492..6a97654818 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,21 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M="; + sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo="; + cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; + + checkFlags = [ + # Fails for 1.6.0, but binary works fine + "--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output" + ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix index d2978ec7bd..ec2ded975f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; + broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix index 57dbf849a3..1fb2912d64 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "23.0.5"; + version = "24.0.8"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-6pXbHkLdJw0+G9lep/tGkbSGAf8AobkQQgvw6gPYlro="; + sha256 = "sha256-nxwSJ/rQJYMNrtTWSmqcrJQwMK8zRwIG4jccVyb7OsQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 6f6151d1ea..99b4b2aefb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c="; + sha256 = "sha256-UQR3BaBcnD2o7QJEBQmdZdtVaTo9R5vSHiUxywy1OaY="; }; nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix b/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix index 5791efb9a9..ff20f89574 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "translate-shell"; - version = "0.9.7"; + version = "0.9.7.1"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "sha256-OLbGBP+QHW51mt0sFXf6SqrIYZ0iC/X10F148NAG4A4="; + sha256 = "sha256-ILXE8cSrivYqMruE+xtNIInLdwdRfMX5dneY9Nn12Uk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix new file mode 100644 index 0000000000..9f098efef8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ttdl"; + version = "3.6.3"; + + src = fetchFromGitHub { + owner = "VladimirMarkelov"; + repo = "ttdl"; + rev = "v${version}"; + sha256 = "sha256-IR0cDXQHnMDI71Vg50atS98YorqAQKc95EF1+m9cxFY="; + }; + + cargoSha256 = "sha256-658mN3R3opjvqfnIDcbh11ZSOTDbpYnhCgGGx46Mrrc="; + + meta = with lib; { + description = "A CLI tool to manage todo lists in todo.txt format"; + homepage = "https://github.com/VladimirMarkelov/ttdl"; + changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix deleted file mode 100644 index 690dd9d64a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: - -let - desktopItem = makeDesktopItem { - name = "tvbrowser"; - exec = "tvbrowser"; - icon = "tvbrowser"; - comment = "Themeable and easy to use TV Guide"; - desktopName = "TV-Browser"; - genericName = "Electronic TV Program Guide"; - categories = [ "AudioVideo" "TV" "Java" ]; - startupNotify = true; - startupWMClass = "tvbrowser-TVBrowser"; - }; - -in stdenv.mkDerivation rec { - pname = "tvbrowser"; - version = "4.0.1"; - name = "${pname}-bin-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz"; - sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/share/java/${pname} - cp -R * $out/share/java/${pname} - rm $out/share/java/${pname}/${pname}.{sh,desktop} - - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - - for i in 16 32 48 128; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png - done - - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ - --chdir "$out/share/java/${pname}" - ''; - - meta = with lib; { - description = "Electronic TV Program Guide"; - homepage = "https://www.tvbrowser.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix new file mode 100644 index 0000000000..afc8100039 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix @@ -0,0 +1,87 @@ +{ lib +, fetchurl +, stdenv +, fetchzip +, ant +, jdk +, makeWrapper +, callPackage +}: + +let + minimalJavaVersion = "11"; + + newsPlugin = fetchurl { + url = "https://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar"; + hash = "sha256-5XoypuMd2AFBE2SJ6EdECuvq6D81HLLuu9UoA9kcKAM="; + }; +in +assert lib.versionAtLeast jdk.version minimalJavaVersion; +stdenv.mkDerivation rec { + pname = "tvbrowser"; + version = "4.2.7"; + + src = fetchzip { + url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.zip"; + hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI="; + }; + + nativeBuildInputs = [ ant jdk makeWrapper ]; + + buildPhase = '' + runHook preBuild + + ant runtime-linux -Dnewsplugin.url=file://${newsPlugin} + ant tvbrowser-desktop-entry + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname} + cp -R runtime/tvbrowser_linux/* $out/share/${pname} + + mkdir -p $out/share/applications + mv -t $out/share/applications $out/share/${pname}/${pname}.desktop + sed -e 's|=imgs/|='$out'/share/${pname}/imgs/|' \ + -e 's|=${pname}.sh|='$out'/bin/${pname}|' \ + -i $out/share/applications/${pname}.desktop + + for i in 16 32 48 128; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/share/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + + mkdir -p $out/bin + makeWrapper \ + $out/share/${pname}/${pname}.sh \ + $out/bin/${pname} \ + --prefix PATH : ${jdk}/bin \ + --prefix XDG_DATA_DIRS : $out/share \ + --set PROGRAM_DIR $out/share/${pname} + + runHook postInstall + ''; + + passthru.tests.startwindow = callPackage ./test.nix {}; + + meta = with lib; { + description = "Electronic TV Program Guide"; + downloadPage = "https://www.tvbrowser.org/index.php?id=tv-browser"; + homepage = "https://www.tvbrowser.org/"; + changelog = "https://www.tvbrowser.org/index.php?id=news"; + sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ]; + license = licenses.gpl3Plus; + mainProgram = pname; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau yarny ]; + longDescription = '' + TV-Browser shows TV program data arranged like in printed + TV programs after downloading it from the internet. + Plugins are used to download program data + and to provide additional functionality. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/test.nix b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/test.nix new file mode 100644 index 0000000000..b5d12ac6ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/test.nix @@ -0,0 +1,40 @@ +{ lib +, xvfb-run +, tvbrowser +, runCommand +, writeShellApplication +, xorg +}: + +let + testScript = writeShellApplication { + name = "tvbrowser-test-script"; + runtimeInputs = [ xorg.xwininfo tvbrowser ]; + text = '' + function find_tvbrowser_windows { + for window_name in java tvbrowser-TVBrowser 'Setup assistant' ; do + grep -q "$window_name" "$1" || return 1 + done + } + tvbrowser & + for _ in {0..900} ; do + xwininfo -root -tree \ + | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ + | tee window-names + echo + if find_tvbrowser_windows window-names ; then + break + fi + sleep 1 + done + find_tvbrowser_windows window-names + ''; + }; +in +runCommand +"tvbrowser-test" +{ buildInputs = [ xvfb-run ]; } +'' + HOME=$PWD xvfb-run ${lib.getExe testScript} + touch ${placeholder "out"} +'' diff --git a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix index a3af42c0fb..5d9965c0d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -21,13 +21,13 @@ python3.pkgs.buildPythonApplication rec { pname = "variety"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; rev = "refs/tags/${version}"; - hash = "sha256-Tm8RXn2S/NDUD3JWeCHKqSFkxZPJdNMojPGnU4WEpr0="; + hash = "sha256-Uln0uoaEZgV9FN3HEBTeFOD7d6RkAQLgQZw7bcgu26A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix index 6cd7be52d5..cbe3186722 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchFromGitLab +, fetchFromGitHub , pkg-config , gtk4 , libadwaita @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.3.0"; + version = "0.4.0"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - sha256 = "sha256-HyH+9KMbdiJSmjo2NsAvz8rN3JhYKz1nNqfuZufKjQA="; + hash = "sha256-WRoAQDOsCi9VbshGzdw+qrVFKQhOQwPgxOfWXYJ3nhg="; }; - cargoSha256 = "sha256-HvuxKPIVwVrcsTKgPwNosF/ar8QL9Jlldq7SBe2nh6o="; + cargoHash = "sha256-pEXC5IVcMhqYM+bGyTh/vaSS9LxYE2YbtIaPplc4Al8="; nativeBuildInputs = [ pkg-config @@ -46,7 +46,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "PineTime smart watch companion app for Linux phone and desktop"; - homepage = "https://gitlab.com/azymohliad/watchmate"; + homepage = "https://github.com/azymohliad/watchmate"; + changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chuangzhu ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix index 16c6bfac7e..32b53a663d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.33"; + version = "1.35"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; + sha256 = "sha256-ZJvlllhF7KPz+v6KEVPyJjiz+4LHM2Br/oqI54a2Ews="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 7635a9ea7e..05f5b31390 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -1,38 +1,69 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl, hwloc +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libuv +, libmicrohttpd +, openssl +, hwloc , donateLevel ? 0 +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; +in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.18.1"; + version = "6.19.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-aTyJhPVqq3jGNVozD39RJ4n0FmAKAtPttW9ecoanEzg="; + hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl hwloc ]; + patches = [ + ./donate-level.patch + ]; + + postPatch = '' + substituteAllInPlace src/donate.h + substituteInPlace cmake/OpenSSL.cmake \ + --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libuv + libmicrohttpd + openssl + hwloc + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + CoreServices + OpenCL + ]; inherit donateLevel; - patches = [ ./donate-level.patch ]; - postPatch = '' - substituteAllInPlace src/donate.h - ''; - installPhase = '' + runHook preInstall + install -vD xmrig $out/bin/xmrig + + runHook postInstall ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ kim0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 1040451efa..461af3ca66 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -1,27 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libuv +, libmicrohttpd +, openssl +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit; +in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "sha256-3Tp0wTL3uHs0N4CdlNusvpuam653b6qUZu9/KBT4HOM="; + hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl ]; - postPatch = '' - # Link dynamically against libuuid instead of statically - substituteInPlace CMakeLists.txt --replace uuid.a uuid + # Link dynamically against libraries instead of statically + substituteInPlace CMakeLists.txt \ + --replace uuid.a uuid + substituteInPlace cmake/OpenSSL.cmake \ + --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" ''; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libuv + libmicrohttpd + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + IOKit + ]; + installPhase = '' + runHook preInstall + install -vD xmrig-proxy $out/bin/xmrig-proxy + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix index f217c7b0e9..c7dc0b6071 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "iamtalhaasghar"; repo = "yewtube"; - rev = "v${version}"; - hash = "sha256-8GL2ZvRHtnnLZ07nQk3irJUj+XLL+pyUUA+JJPICPRA="; + rev = "refs/tags/v${version}"; + hash = "sha256-5+0OaoUan9IFEqtMvpvtkfpd7IbFJhG52oROER5TY20="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix index bac11b6899..dde9f3b698 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix @@ -10,19 +10,19 @@ }: let vendorHashes = { - x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8="; - aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ="; + x86_64-linux = "sha256-Upe0cEDG02RJD50Ht9VNMwkelsJHX8zOuJZssAhMuMY="; + aarch64-linux = "sha256-lKER4+gcyFqnCvgBl/qdVBCbUpocWUnXGLXsX82MSy4="; }; in flutter.mkFlutterApp rec { pname = "yubioath-flutter"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k"; + sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index b1b3a57819..9495e254b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY="; + hash = "sha256-5Zyrmo74k6Pl2pyVo3oX/haFsR8mHlM05ubPllintFQ="; }; - vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8="; + vendorHash = "sha256-CpXszXmySPHQehFy6XSOJFXq8ZGixO928+zrP7/vwCQ="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 7a05c9f9b1..77c6261564 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.47.186"; + version = "1.48.158"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI="; + sha256 = "sha256-hgV8+Mjth43KItly98lTh3Ur+h9vA9BfJxOqMGl1ndY="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index aea178a3af..4a7048010c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, libffi , libepoxy # postPatch: , glibc # gconv + locale @@ -151,7 +152,8 @@ let libepoxy ] ++ lib.optional systemdSupport systemd ++ lib.optionals cupsSupport [ libgcrypt cups ] - ++ lib.optional pulseSupport libpulseaudio; + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional (chromiumVersionAtLeast "110") libffi; patches = [ # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): @@ -299,6 +301,10 @@ let use_system_libwayland = true; # The default value is hardcoded instead of using pkg-config: system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; + } // lib.optionalAttrs (chromiumVersionAtLeast "110") { + # To fix the build as we don't provide libffi_pic.a + # (ld.lld: error: unable to find library -l:libffi_pic.a): + use_system_libffi = true; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index e12667c94f..1eeec11742 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,27 @@ { "stable": { - "version": "109.0.5414.119", - "sha256": "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb", - "sha256bin64": "0iap6i4zmflp4fsj16knwdp03gixsdkbys0scbvvzs3fzy2r5zkx", + "version": "110.0.5481.77", + "sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73", + "sha256bin64": "0jjdgfps6siy9hk2r553vvh0jmkn987ad77sv2zqs9gvx0vsrwgp", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } }, "chromedriver": { - "version": "109.0.5414.74", - "sha256_linux": "1mhnw4maixwfhrz3r3mhpr9bl9hn7cvr2ji6y6ai32hxa1ix9m6f", - "sha256_darwin": "0w46xd05m7irfxqsfnjwgd2v65c9vgnh8awaknqgh02wmdgx3nm0", - "sha256_darwin_aarch64": "0amb2kd4cq4clir9gqr1b1mdy46m8nwzka227xxjd2i14vwzckb0" + "version": "110.0.5481.30", + "sha256_linux": "08j28ahyahlgmy67hcm8b1vd4kilvf2yvc25746a46gdf8zz0nmw", + "sha256_darwin": "0xlq0fi9g15yvd6ysqcfkxpbr37av32h0f3af9vxl8vbywjfsxn4", + "sha256_darwin_aarch64": "03j47ha9janbawbjxy9n84sx70iisk6qr0bvb218cq5j1d5x058b" } }, "beta": { - "version": "110.0.5481.52", - "sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq", - "sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r", + "version": "110.0.5481.77", + "sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73", + "sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr", "deps": { "gn": { "version": "2022-12-12", @@ -32,9 +32,9 @@ } }, "dev": { - "version": "111.0.5562.0", - "sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j", - "sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm", + "version": "111.0.5563.19", + "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w", + "sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp", "deps": { "gn": { "version": "2022-12-12", diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 72767f7430..aa6aab0b66 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "110.0b8"; + version = "110.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ach/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ach/firefox-110.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ed485ff5d4df09a247e5325f7119f18a60dd089561bfbba4fd0defcbc74e49d6"; + sha256 = "31ae9965cff4728c34e61de004042a30415e46159bd6b40c34a67d4e78ada023"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/af/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/af/firefox-110.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a8998faee88db140727fb4d38e00ae105afbdd5dfbf995ee840eecb77f5b4fc0"; + sha256 = "5c5e55457833a628cb343357e41a27813095c727c958d057b6421c3c9dac0371"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/an/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/an/firefox-110.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "04161f5668253852b91d873fec38b0a55576e0055af214e6fe452b6e58fea228"; + sha256 = "944cf3fcf5c1886b762f023b601c836446b65a482d11ff9680ba292cd9d64922"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ar/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ar/firefox-110.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a86e49d7960cb2662cae59e681338140be1296ae14691b3cdaf349166ed2189f"; + sha256 = "dcab6b1ad88b1aad81894485d15275612275edd915be75b5c139c3eedb3d6e87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ast/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ast/firefox-110.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "942b97bd1fafe71995f3d17bcc5d651e67fdfe292b65e617bb204d119e0744d9"; + sha256 = "a3914b98a160c16c8543d735525c65569b0da1c677e7b476ec19ee1614a7c03d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/az/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/az/firefox-110.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "4e1054551c830ac7d14f2f6286a3eec6f054c4a7a7fd26a3860c010bf5459d98"; + sha256 = "69faa3b5740961fb220de2d2be159a5c2e308c14caffa2d4c92816f31b185401"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/be/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/be/firefox-110.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0308d8776afc25f9ce0791d406289ef8e1909f88ae0cb7c91f9e6116ae1afb6e"; + sha256 = "5038523205b8835931a6879a2c0cadaa726f70d39af74e37c9b4671d0395e327"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bg/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/bg/firefox-110.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3236f9eb8c7ebd860c4629b46dacbcc9f72cd4d2af3dd7930fbe79eaa6f76e65"; + sha256 = "3a3a4cd6ad563fed1094d29c673d8774ae5435646ab48f25638e6764c8bf037b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bn/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/bn/firefox-110.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "6dd832f1ba0119e3b2e84b34ca0a7af0aea2f3615aa4c5f10fa6d52e27ca25e3"; + sha256 = "8cbfcd33cd68e427c5d0bd65d43d3bd22ea26401ce0649e45f5728a870020279"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/br/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/br/firefox-110.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "39dc415cb13964a73598df7e8852c04eb68093704bc368842918c7651d469571"; + sha256 = "055dc2081368f71d57b5f32640a6b96b6c5567fafe461f4108d50540e040f00a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bs/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/bs/firefox-110.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f550885ad47858803262cc56a01ff94ca98dbe70ef647d45ef07704d320aeb10"; + sha256 = "11bbc7fc72ea6dc081e1c75f0c91ea5851573f47cda96b90d1d0658a2ed66138"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ca-valencia/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ca-valencia/firefox-110.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "35bedf1be1a9666deee43f1fba4b5d929997b68626d0cd5d34f1f874bdfc145b"; + sha256 = "e1dcb70021d88a35b94ace6fdd8735bffa9da5d978d49962752bf8c06b45f0a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ca/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ca/firefox-110.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "50e3be2fc9c0ee6d81fc21e93f500007e660eb465a4efdfc1182ab3f361db9f0"; + sha256 = "d47c011080be7a34ab1bcee2558169103ef31ae407be9d20065b5a3b9b1b53a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cak/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/cak/firefox-110.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f76a35618b17552eb7ba1f4c221ac2c1b279f39a23b90a3c801a214bdb6a90ea"; + sha256 = "c0dc6511c558e8593f2220e26d1adedac5030ad27e32b73c803e59eee3792266"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cs/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/cs/firefox-110.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "dac3d9822d05821535aa87c013e64bd11fe7bfb241817bb4943fb9476794327b"; + sha256 = "2e66bd42956d486fde8f6f418cf8b7a664f4272beb0412eda621432bc4d6d664"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cy/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/cy/firefox-110.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2a93da71a12b78c55c125c8a71a3b5e5c9785ddbef1eb57bda0ff6c7c2f4fa90"; + sha256 = "f7f9f36eaad07bc16e2838eabbaa144e42a31acfccf5f61220d164995beac86d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/da/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/da/firefox-110.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "9b63c1ff561acf270ceba10907371f63fd3ec5104fa9fd723c41cc88d207d860"; + sha256 = "09e0c7191d7e576b6293062fd1ee59ee87ea8ef56762d8f385e04ae08038b3e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/de/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/de/firefox-110.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b85d11c9fe7af3b3913f772aeeca37bbae95bc4bcaa9d9e2e711025b861a0713"; + sha256 = "44b36a559986a1f8187b8d0ace34a6777d84ad3b96e20c52b45a93f6ab9364bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/dsb/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/dsb/firefox-110.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9a54cd55fe019b5f902aa9f6e21dc03629c35cc7acf8112b98b77881df88c894"; + sha256 = "7d8eb881d6c92d7bbcf4fe244fe9374c6e4dc0756f692aa67a1a83ae9e296dc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/el/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/el/firefox-110.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "a659eca2a2bb201ff27e989ba748abffc1bd44ddf6c69312c8829a91887d9e3a"; + sha256 = "d364ad3a716df093a87c8c8f3cf91e31f99983862425e846837c9acb714cbb11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-CA/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/en-CA/firefox-110.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "45e5b039f0e2b425d1051af5bde8a447b1f738b3dcf0c2321043af28d370ff1e"; + sha256 = "4dbfe3ed0cda9927228732caa39bc7e6e9c068e83d6449d999850bffa8e4d7a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-GB/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/en-GB/firefox-110.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f53fed0d18ece63d2e94840ae1023d261b07a3556a4fbb8d4e2c8c4fad016b86"; + sha256 = "17b51ecd51b75ef1aef4a1a5e6f03818f3614104ebb8f9e2dd5ec94e8c1e6c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-US/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/en-US/firefox-110.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "230b771a572ca8bcd9e85dda0a967bdfa504664222e9ade51839b5c22735e7c2"; + sha256 = "4644345d3dc92f17ca493bd69c24319e3e453c8f6a81217b43bb32821a1c9b8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/eo/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/eo/firefox-110.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "1d171c124c45b2c22f4d64a51366f1840f2b72117d0ef65fa33a4b44623a88cd"; + sha256 = "c31c9339a3cda78c9724a7847705ee3f25451bf797aac37e5428eded60a2e0bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-AR/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/es-AR/firefox-110.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "eb7d67d7cf5460d8830e9c3ec6ddc4724857d94f15e809cbf02a26d7d9fcd6d5"; + sha256 = "1b66709563bad96c1ee3b67091b3201820f2c34f75ea4467168a04ae88319bee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-CL/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/es-CL/firefox-110.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "55a45cb18fb2f2aa61de068629a1770dd37096ddb9424fa83031354c1e3a6f46"; + sha256 = "69180c0f140ef0733191b9505c9a799227605aa2cc49a081978b66f54d72e093"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-ES/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/es-ES/firefox-110.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3dfa2760508777cb93b44650bb6f1a70de2d10c3ec43e7350e901794fcae4f4b"; + sha256 = "d29f411f2a7b7046e50dafaef7ab0628d58608534bb0056523d4c561d5600a9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-MX/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/es-MX/firefox-110.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "39875c88fce55c54aa8f323b9530472dcafbc6c1f93fb8061f61c90b866d74b8"; + sha256 = "040293398dd87b5424b6d6abc83e147ce7bd6c71619108f65bac41f5c12c8655"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/et/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/et/firefox-110.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e041c7c050ab3aa3360e8f7a47552ac7e9e8f74367169227d2b1985cb1f4f611"; + sha256 = "806ee525fd951f1c4d0fd46235296bcff38eabac732ebd7b4421ab6574c82f97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/eu/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/eu/firefox-110.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "60327e88db690ff8851da6979929b88a272f2bffa22b131ab47c69e7b508020a"; + sha256 = "ae713cb93c34652de8a0a7e669f901aa27082aef395ff44d2e42bb1ad80fb84e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fa/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/fa/firefox-110.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "91657f9b44d1ca43bcf9b11fbe3426ad352e98945936439d3db33486d664ee29"; + sha256 = "1dee306beb9d04cc562eb630cea224beb0f7c21b51f8074f91ce6f0a699aa11b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ff/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ff/firefox-110.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ea713dd820cfae67ee4af92c2e5b1561e638631043790e7e11ec8ec95f7dee8d"; + sha256 = "d8e97d4a24f859925e18cbc475cb30a4a0ebc469799ac8a93cc8c61255f98159"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fi/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/fi/firefox-110.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cac98b1458dad786bc5260771ecf9c434c3458fbfc0325b528bb268736b02276"; + sha256 = "5784f6c63ab0bdff14e1374259428314a934602f691d845d357a2a54b83eafa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/fr/firefox-110.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8433f80253931ddf0c76ae09536da4d4f2d6fda042228f6c2421e3dba684ec8b"; + sha256 = "5e1579cb443b229755137de1b8a0d8e421c3ed9ccf27d6070b8663acdb32e4ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fy-NL/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/fy-NL/firefox-110.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e4291c6245d3f6f7d3eab0614e690eda1e6fa1880776cc7cafbc1e892ae67dea"; + sha256 = "c93c7438f6f462a90df4e86cadcfbce1fb58061195cd6dffa754139c207e060d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ga-IE/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ga-IE/firefox-110.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "db193e8f7bc6ca08d80d30c4062afd4d64063da93360a5be48b359c572733b83"; + sha256 = "a86556b6e125f86ad7db1f74bb453c6567e3c10381dac80673c82613014ce7a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gd/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/gd/firefox-110.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5f11dc3c2d447d4307979e1fa684847770eb7737931998523b78e96cc8750c7b"; + sha256 = "bef22b532b36eb61ece5cfac62c04c0753692f1fc4317106da4f958dcc85f4b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/gl/firefox-110.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "61d21f0c5f0c0b281f53f83833f419f3e2791dd0a642f7f91740f86d13b58c12"; + sha256 = "c9cbe3c40a8b0489f94e635ce21ac971e12b6e46609c1a1e79fe85279e6f39b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gn/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/gn/firefox-110.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "7f3eae32a8b0ebe89af9f456c90390c0ebcfab855be960c120ad65f2ac871f66"; + sha256 = "774831254dace2b85a76943d1fd00719d0893c82e85ec2c268d24e6086431b0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gu-IN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/gu-IN/firefox-110.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3c8b5dfb00e7395de9bd7a47122e51ac98f568d58a604079de736550bddd770d"; + sha256 = "26ef2e863265785e55a1db0de7d1eca3d69e4f8f0c635194fe8c4fb9f8977204"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/he/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/he/firefox-110.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f1d1eced9c70c17f82db231531127a76b7b9ae2d7cf7c8db6d5a367f284e56c5"; + sha256 = "35e1585e53f7c516a05eb377274d25843de0b7505baa456421a7ae10afd9e663"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hi-IN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/hi-IN/firefox-110.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "240c6757b39796b47360927418b25346bdda14c68581811e61870c0e775d2a14"; + sha256 = "214df11e8e2f96e3d8520197c86d353b2fc92eb69c47a1d42e44eb57d26aa28d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/hr/firefox-110.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ef9d90acbcd8a8e6351864030078d648c4a5149646c262a03c8f6c1de19afc93"; + sha256 = "2539f0397a74e0f42603e37e3a5ed1e701bb3db6c91ba8858651bf268ac9e4af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hsb/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/hsb/firefox-110.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9c8c7bc9437e58984a42ce622722cf52bc23c10f3394c698c939f7bf1c6cee4d"; + sha256 = "9ba490198cf25bc64e7e48f1da2889bf1366e0227dddd6bc5f8440603f2eab2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hu/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/hu/firefox-110.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f4a42365f10144bdfa293e064c6f2a8a93344649b0b7d1ca29b6aa1cd928d282"; + sha256 = "88869c049d718ad4a2a9191eab36ab1ba7435eb28615ddbe2528c8ecc63ae1ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hy-AM/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/hy-AM/firefox-110.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "767e6e39c11252a7ed5604c79385e8ffd6e72ed59ee7013188b75a868c280f12"; + sha256 = "08debeb4d5480429d3c6d2494c8230bbab86f5a1224072d1171e9af9c4b63ef4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ia/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ia/firefox-110.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "4a948be5f55b0dbd64574e53fa058ac1e37c3ebd07b2c7b31bca9a4df9ec729f"; + sha256 = "4353ebe61b8bfd147d9c9f6e1a7298dc63965276e6391d7d7377bdc8469c7c9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/id/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/id/firefox-110.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "172d6b7f6471b30ecec9928be73e86e6cb4c700d7b0f036754675a955a07233b"; + sha256 = "cae1c2a1f0cb11ed8eb8e0b6a88ef46f32d6d1e770c37758d6223e1af38990ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/is/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/is/firefox-110.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "82dfe1ea54cf9dcc0a3c3bea2538f2c7bb2c9a8120361ca718160e2cc5faabdd"; + sha256 = "6e243ffa48836061e268a69c52650ead4d876b7575cb1500e398f72a7d56334e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/it/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/it/firefox-110.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5ee0de017187bae620553ee7d387e0a7fbdd828007f509b2799e5b4a42529e7c"; + sha256 = "df074738b489ed92677d7d18715e9819b13118c8001b32bcb6769ffebf5dd1db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ja/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ja/firefox-110.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e1c4d3b19caea149985ad839c5a5eefae61fe489825363a7dc600158aa393ca6"; + sha256 = "34b7dfea9967aebb348ab5930036693a73aafe5dc6b49a21de34e7a2a3fae246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ka/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ka/firefox-110.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "066acc56597a25502041628781ab9cb1d9ae8b28cb34d20651c7a5b37f7cbbbe"; + sha256 = "11db2d3acbce4390d43333f6bf82dc2deff2e5f3c9f1d94fd3f860974da0984e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kab/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/kab/firefox-110.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f1f851d0d5e2a4b4dc4c6e1e8cef8bf0536a0d87c149fa0a7f5634494e253e02"; + sha256 = "d35888d028b57448ad09863abdb28518783ebf7adfb5bff1057bbb9591c84c9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/kk/firefox-110.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e49afedbdf6e979aac6f76d25564d48fadc2a7042715edff107752da20d54951"; + sha256 = "1776563c4712663498f7900913498f4af533f157a0656504205ea3ec553810c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/km/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/km/firefox-110.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "626802d920890971e7e70865dc8cf02848eac285bd11c7905c76f1b8d3d45c47"; + sha256 = "6f6bd29ccb9fbc31d22ffef7e909f77014b6d35e1bcf2d92bd5d06741f5442e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kn/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/kn/firefox-110.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f4a3c4730fe26412fbec6280059ee60dcb14dcc120c34bc866e63f2b59337ab9"; + sha256 = "cb396c14f58c0f0fb6199568bfce94bac7126113dcd288c26e9fd745ec075570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ko/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ko/firefox-110.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a86e103fa646e69806c3e602a3377daefb29e0b522293b919fdd480d6cdf12b0"; + sha256 = "26be1fd680e8613bc0df1729b51ef393413dbf469edd656b64f9e3ec840506f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lij/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/lij/firefox-110.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "001967897e7d43ccb814aa3da320f06ab92d7dd152b0d174fc5d7f37c49f4bbe"; + sha256 = "f94321dd1d97ef4eb2e3d01ac153432e3b897ced0852019777d08ff63bb613b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lt/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/lt/firefox-110.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "78030269b2fe5f151a0236112e0ecd4b43b61d577171e9b0544b2ac60be5869d"; + sha256 = "9ddfad4f25428f632507fcf0916af394796a5823886eba7e5e460f39711e9f99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lv/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/lv/firefox-110.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b944ab8296cedb7cbb405b1db330e9011064dbf4353a2f3bb1741d21cff312ff"; + sha256 = "a980fcd6a227bbec1bd162c90951ecc5a1368f35b1d52a62c010a224af6a86da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/mk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/mk/firefox-110.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "d28f87dd4e040dee024e384c686fda5ed1bb5bca8807581e094a9bfa7a763ddb"; + sha256 = "64eefab42b3baabfe7e0c78f2be5c4a7915d0484c19a8ae9c9a9f39285b46af3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/mr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/mr/firefox-110.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0cba8c59d778577b8ca9d2d7bec95d57dafe90470867b7ad0675bec1fecb4b90"; + sha256 = "8373a5f5298a16a7d2fbee2161813fef8cfe99ee81528e47b31a99c1c304a039"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ms/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ms/firefox-110.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "989c7785d91d2fce8a37f0e79ec1e047397b2bf3addf8859fb742426c5279038"; + sha256 = "fd2e989bf6ea3673ed13f3092d3ac928dffd9da9808ae8c4b710420692c0907b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/my/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/my/firefox-110.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "730c8d4ff818e03dbfd88f2e9a8ee131dc5144ee6b753fcfde2825c8cfb309c1"; + sha256 = "eb1195977ea9c0fb4d005be03025ff9bfc758594f13cd40b9548bcd8893f6a04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nb-NO/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/nb-NO/firefox-110.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "32219c5b17363f0e7cb5a6b762bef28cc8af7aff7f0f7a3558510884505077d0"; + sha256 = "c06a88b710d47532b580d371848575a5fb3cd2c0972efb175a2f0e656baa3c9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ne-NP/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ne-NP/firefox-110.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e8cc257a762c8b62fd00a640104d115416f1be3841b304acc6c4dd25a3145aa0"; + sha256 = "f28d2e60da99abbbc9531280dce5a48e1c6a85c23aa52d75317260c645d56d06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/nl/firefox-110.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b4535c4b7683ad89368c2a156d580d94ce678e858e34f56b2d2eddd4326cddc7"; + sha256 = "e03c211e04943a1fd533048219b196f973a78d010190eb723a845affe05aab8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nn-NO/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/nn-NO/firefox-110.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0ebad9a365e2f7da6119dd821e8cb4c26abd939c942e4bfb451ca9ce93cab68f"; + sha256 = "77ed81933791d1c4b4aea857bf79f4be850c9680c9152a299539bae69c9a4268"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/oc/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/oc/firefox-110.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c66df579bf6b9f23a87937d544f10f5b5a165e18205b8ceceae100a01074c1e8"; + sha256 = "c025a57d920644bccae6534ef7b4baa7bc5597e7c6f29a982a56b413f7235e33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pa-IN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/pa-IN/firefox-110.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1a60b5aed38933f2d5898f4ce502057c8f3f5207cb133709ec10ec4f4f7016db"; + sha256 = "4c2afe6e602149f82ed46feff5586633b120a38581d396d01e444db18b7d6c61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/pl/firefox-110.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "bc52ce2b2189763296d891259dc131f7a3be3287eb4e615d13ba01083ccec7fb"; + sha256 = "a08c4784e370feffc27a8218d59ce941a187dbb8498553c40c57620aff3fce96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pt-BR/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/pt-BR/firefox-110.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "257045f51d0f3b78b86b8657add634acd67a9f7eb40ee21e41c475df28ffe19c"; + sha256 = "43fe3ea13c92fe845866b3ceddeaf55c61f8f84270ece7ab7060cae3965dd584"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pt-PT/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/pt-PT/firefox-110.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bdfd19bbbc264bb69ee68f0c07e10fe65a0333305d9e2c22fd0015343b9b8993"; + sha256 = "caf37be2d9ad76471025e878e3bd17c540f647cdd378e6b034fb665bcc6b0150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/rm/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/rm/firefox-110.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0a80709da5676bc49758d0adb791c6e663dda5326600926be4059c03fa241e1d"; + sha256 = "6f93fcbd9dd829f3eff38ea145ed828e1998de59fcb9749c8aa6b46f4d3949fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ro/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ro/firefox-110.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "58c6b48d460c424662a82ebaa48a655af938b84f30e27e4bf8b6e4481e3eebd0"; + sha256 = "0c8bc19252f5ff28cc15a4a34d7d05cc1febc596669f442c03a839a556e0add4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ru/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ru/firefox-110.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a85d28c3f4671380a39be21bd9c1c8eacc7677aacca05ce6951bc58dc38c1940"; + sha256 = "e9f505eba125720f74b36688b04e2806140ca90cc7142abe9866728b062e52c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sco/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/sco/firefox-110.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "a4157c14e1f35b6603a3abf50ae2a03c368ae37cd9e36f5b72607481523b3305"; + sha256 = "9859e26128d7057e79cd765c4936043317993bbbe884f3d279ebfef7da1666e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/si/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/si/firefox-110.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "da52abc50cd0aaf67f3daf9f78b87415015f2133eb2879713f97d360f0ba633d"; + sha256 = "6ecca3aa4e002cd43fa9d8de6b4705278fc7521a0643b67fc34e87b26019cd35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/sk/firefox-110.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f82fcd00aa59756ee7e11d3a003c871dad71b651b3aee51d40dee250358db070"; + sha256 = "6769cc76a0960dd7f8220e10d23f3862b44827c5afc5c3c36c33a995a75d8bc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/sl/firefox-110.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e682fac35628626e6d99b32c7ac08fa768b27e27e9ed6ab0ca054d6a337015c1"; + sha256 = "f78236b4deda06b2976275979081a0d6590b7a1bf9996ae2146c1d721a41a2cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/son/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/son/firefox-110.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "901abf7cb8189875fc23556d0599ec56467ead6d01f7132be2cd7ad8ae0342bf"; + sha256 = "9c355b9a2c650c43749b387228a677e26f34096e9c091f5a84dadd79b38b0077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sq/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/sq/firefox-110.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9a0401842eac013a5618b00fce32a048ae401dd7b02e5237207987799bc80ad2"; + sha256 = "2129eb34364fae782722ff5e55808f0ea640fcabae4d3feed37d349d7d44696f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/sr/firefox-110.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "753ef3fdc0bb3c538c2fe65db2c3db27184e0430c8d3ef78248e68e1706cbc54"; + sha256 = "da56a55355fd87a40aaa3ea7315b6cc48cee2a4952ae77f28c8f3ee702caa2a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sv-SE/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/sv-SE/firefox-110.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2977dc95a24581051f4f0234ad4cb21bb5742af5933313442d5f3f4c2f869550"; + sha256 = "cb164ebe773bcd188bd3dc1658a9ce686bca15c1025d16a3eab4126b33f8b17a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/szl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/szl/firefox-110.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4c58983a77e3485edb8d2035391ea9d098196f1e19dc1ad070f7f77ddb5c0f97"; + sha256 = "cf31f589ebaa047daeceb383fca20989034f52fb8808cc6e64199a8835f65778"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ta/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ta/firefox-110.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "1204336c6feb2ef3c116a043151715f05d0498a1a85a0b008dcc3e4e378ff6ef"; + sha256 = "35142469252294264cb0be9ede847b8fd43bc1fd4f5faeb519058a864869274b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/te/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/te/firefox-110.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "214d936d334f0ad7d7a0a417b9c73cdfd38e6ba72dd8fd17e80eb45bb1216b06"; + sha256 = "ba3e61e2d22aedef87f5725f08d6df177f6e43bd87d65cccf248e162769b92b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/th/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/th/firefox-110.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "aeee496b32287f98880594bb07ad217e6cd90184a3f8615c01f77c5321055fd9"; + sha256 = "ef10210a861043649525f6ec7e294ba7f8f79c4db8a25d28156fb878e9704d8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/tl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/tl/firefox-110.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "242b207f636b7c25e6f6b3de964ee47eedae9380b764b05324ba633c93c93a81"; + sha256 = "0f46489ba7bdd2390bde6ebbe70578ea7e6e24fcee45a99249547b792bbbbc8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/tr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/tr/firefox-110.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bf8122a581172b5cd97160899b253bdb9f6c67a37dbe9a7285117092adf68c94"; + sha256 = "3a6d45dc8078de10d628164f696fb6cbed8182e14b26a0a3cd7747e921af4a69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/trs/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/trs/firefox-110.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "7995c69237e99c42101c1ace2d9a591e099192a8b8a5c2779a1764541d279f1d"; + sha256 = "066bb3d0aee2dd94991b3b0ed08563767130d79a41e0d6e44060bb5aeeae3b5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/uk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/uk/firefox-110.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "65db0c950d4626ccfbd9d9129cdf7a5baaabe9f37d78eaf58dd14c459d7be4a0"; + sha256 = "56f4b5fbcfaaf3418f6e83288907a30fb77396b09c84ecf27c3f0ab7cc0e71d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ur/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/ur/firefox-110.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "107e8e0f224a67b3bd69dd6f956dd8887fb475e02326ede21c408cb0a44f07a4"; + sha256 = "a954f58cb702ee7c6acc21311db06ea7a95c78b24f6f5f5e2768852d5a646ed8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/uz/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/uz/firefox-110.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "fbca32000d6cdc39d447341e08d2ad587e1545e1f7dbc28dc2efa13b47a31210"; + sha256 = "8d90939c84ae432aa12d3a1c8300fd9f69f335017a405080041ddc76735c3fe5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/vi/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/vi/firefox-110.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "78364adb4b166b0ad5852b8f8eb3d7c3f0a38eb7a58866e4f12754c4e8ecc265"; + sha256 = "748ed1d1ac5a866c1a3b45423cbc3f11c904de523c0af7d7d06ac77c6a0e9e0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/xh/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/xh/firefox-110.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4e9290326419205d52a588a9f44f2d53693e6b987c01842fcda7e708d77d7984"; + sha256 = "62407f99e613b1d02437af13dd25061ea8b4673d5301de9754e394c62beb8c08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/zh-CN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/zh-CN/firefox-110.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4f5bba83fb22c21922680469a484a9c2a2d2bcdd070e998dbe36785a880d756f"; + sha256 = "ab7626c9a4e80077d618624b77c6415503d8daa7784b628fc8ff783b5f769325"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/zh-TW/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-x86_64/zh-TW/firefox-110.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ba932bce9c5920395e154703522b0752ccd666ff111f7cb822cb27bc17941a3b"; + sha256 = "f0122120e7bbd29ebcacf1549d8358fdc8fbe68286fd38a884cf1406b9647485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ach/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ach/firefox-110.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ec500c8c4c8fec8635279c5423d322e621766f56772a4e5a63dc34bcbe3d61ed"; + sha256 = "d08fbdab007dd8012e7de70afa851e3fb47dc928f8e437b097b908d2b1111adc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/af/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/af/firefox-110.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8810a1cefe5545a7dafe58174421ba9d631d22ae49462544637cfe167a97d2bf"; + sha256 = "dca48104c30148e710ef3bf38c20740f4d391d51f5bb0c29a4fa299dc1657797"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/an/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/an/firefox-110.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d8bfc06a0fc67ce4c84b339a28177ff7066f72f5cb77b37922170e073ac74e99"; + sha256 = "81580862a31a72d1c94443ec96a037e3243ac240e9306cc85d8668f9fb1e140c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ar/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ar/firefox-110.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ec6674a2241852a443d0d22d34eb094c0de075e7d255f9bb026251dfa6aee85e"; + sha256 = "293794b5e71a69a497eb2340f25c0ad2bab4dce44577720750c9b5247ac8517d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ast/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ast/firefox-110.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "70b5050c81b7f0c1045e868c87925f1d0526cc3b133c15ef9edaade6ef7f50aa"; + sha256 = "026e95d910230e5515838314b07b2a05ba843eb2384d82d05259033d4e982013"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/az/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/az/firefox-110.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1eba11cd825d691b0bfdc71e4e7f017d3b52992c5fc1a7db89a85cf6b8723680"; + sha256 = "54a0be8d8d7c87f51a2e1321024cf35dda8fdbadf112d22ca200fb148d11cc3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/be/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/be/firefox-110.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9e604836e097c1b5412fa4acab74b650881590c3430c1b822d5b1f7f6edb4e9d"; + sha256 = "aeff9b707df2e696e5c2a72e0a9b1106435f6cad09bb24d78589057afdf50137"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bg/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/bg/firefox-110.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4e756271ec8af70d67ceddb75962de3d398bb183e28fbb8b18f77c92d453b6e8"; + sha256 = "bd25f76163b35cf2cc0d106d2ddb134df9f1937b89d32da5ae8147aa81bf400f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bn/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/bn/firefox-110.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "089315934a955fd48f4a546eeec9a74ac483a742dc1456c4bb078f927a1a990b"; + sha256 = "6306780032ba13ae04ad3a9830fcfdc01bdc96ce32471696a0bfd4dd326451cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/br/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/br/firefox-110.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0448de8755a6d48e012224db25acfe11c20b6f41e7b39935cba9501ff513037f"; + sha256 = "375a6f920990b3d69aa4b49af3eda4ac0825f475ae235635ce6a5a9f1cd24fa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bs/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/bs/firefox-110.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2c749a81052756da521076a67fc0ae06f110e80278de0588b252354667fc85b3"; + sha256 = "d869622124c78a3ccb878358c45ebcf6be6510abf2b571182f9c0736ba6ecfa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ca-valencia/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ca-valencia/firefox-110.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "784fb8bf6a32caf67052c653924b9fa51fad94d3177f8f8f29c6c210324e6f84"; + sha256 = "0c453f3967b12940754960b589bd2f5d694378194a121403f0fd4e630ca5f214"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ca/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ca/firefox-110.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9133696b439986db2a1fe79359c341b9868dc44a2167e8a4f645942753f562b9"; + sha256 = "e341c9c3554da53e7f6b599d5ce7e10ab5aebdff623bdbcf486e1ea6a6aa7c9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cak/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/cak/firefox-110.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2b7a3a15e6c2326420b3e82ab0e126370b9a88ca32e96d99b47238857cf57c4e"; + sha256 = "82d6787e482c8a30dd012fafb7bf5ab5815c73cf559dc9ff856beea9f468f326"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cs/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/cs/firefox-110.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "51bf4a01e29710079536bf4000368f1087f707a1916c20ee2d5d14644fed6e2b"; + sha256 = "a485d12523544b93b7487a132cbe7a0ecedd8f780ce98d9ec9fe2455b904772d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cy/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/cy/firefox-110.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5b5073c00de486045e38232f680ffbd49ed21a378b0d7ed7814e00b908e59596"; + sha256 = "3837e042c144367708c6da71a4836b33792d31b3d24fbb5507608577d4679935"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/da/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/da/firefox-110.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "aa786c2c368d7d51888e85703b19cb5c12c70d55452922d3b68945366c0ad5be"; + sha256 = "58250dddec107dd1e90e2d71d059e18cadd4cdeedab1f1b851c1e1c972964cb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/de/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/de/firefox-110.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f5e3e08881fe08da2177b6906b76a0885cadae8b1d02591185f0f702ceb4d12d"; + sha256 = "267382e13a9ed0ae78fc8c531deaefcf240bcdc3b38575d0e8090ffb7dda0b8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/dsb/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/dsb/firefox-110.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "182669ab7334a9b5e74dd8f922a69e010f3db2a2d0ebde4c318176d4c66cdaf1"; + sha256 = "0e5500f084f1b338190f311aa70d3bb5a188ed70c7b266940af3c1b6c95605ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/el/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/el/firefox-110.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "664bd97d14219f58ef767e7beb1b4795d85be49814ae56db8780829511dd4b60"; + sha256 = "692f28d32060b158b23fe2ddfd6731b675f9840f406e7f2664c671dc9c258299"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-CA/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/en-CA/firefox-110.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fc6b10b31e9d8228c0fa89c226efd8d0fee9e170251369bc096e86a98a2cfffe"; + sha256 = "d1af027fd317e0500eeb338b56113dccf3d0a41552bc6dabbc6a1d1bda956f08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-GB/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/en-GB/firefox-110.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e2b5a1fbdeef06d94f2abff9c1e9fa5e5772ba1e3cef31839d47240b1201faed"; + sha256 = "a61ebace4722dfe86612f09bedc29b94bf34e12337fa419c420c25d89322fc81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-US/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/en-US/firefox-110.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "26b6bdf7f5b184f5878622c22861b37299cf2ef720056ea452a0ab1daaacb2a6"; + sha256 = "13f91a9b7f97991ad1b1686db7160daaf778b5b4b26e98e6802aed44bdee5f08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/eo/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/eo/firefox-110.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "307ba5a4477a1234d0bc3f73c6e8e28692212c5d7f58203e4e336100f9d0498d"; + sha256 = "516e2c87fd31d783f298a393332c6f123d839082e5df855ee30fcb81f4d077b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-AR/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/es-AR/firefox-110.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a35b01a8569d34b627bb3a9a24e670f865fdc33d0606f1b0eab9e8c1b7f73601"; + sha256 = "5d6ec5a045176cf7ba056b2c5af1e0a74184b0f3b00a9ac4aff4fab3788ed0b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-CL/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/es-CL/firefox-110.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "6910b74dec7071a2b33b2bd09f5ae61bdee7b77030287d243de90b7f4e326c22"; + sha256 = "0823f17bf0fec81d695521a1ccf8a216cd5550dcdad8a416c027dee68427f346"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-ES/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/es-ES/firefox-110.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "be75ed4c9c6572d92bdde9dab331854eadd07fd5321792c65665a207fd3c5904"; + sha256 = "fe3666ee8c6b55271f0b5388ac8c932a69485c258ea29f2da4335eff1ef6d392"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-MX/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/es-MX/firefox-110.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ff98f40124d28f441215fd19199f2b99b7ed2370842af1045add334c3cf5825c"; + sha256 = "47f38b21961605c7e2b992c3202e49511d5d19bce7cb752f8c9913600b2d9e38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/et/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/et/firefox-110.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "65158799c952aeff6e72ff675f6fb69b8fd981b8315bb45d0712326ee973b543"; + sha256 = "43463f6f2fee8ddcc57a5cc3666f6612bce42bd3087777257def66ae3009c806"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/eu/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/eu/firefox-110.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1d1cc6139aada38bc8c5bad570e7722165eee34081140e97cb3f726ee07b322d"; + sha256 = "41d3b7e25c6c08da8e625613e395cc6d855d29825086b3ab050c93875aa56587"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fa/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/fa/firefox-110.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1771265328653411950394f9688078816b1cf518a8adcdf5c086d18008af39c0"; + sha256 = "14300e7fb0c20450a63ad7763a2df0da64ede5aeca10f34333b8991406eda6c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ff/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ff/firefox-110.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b0602ea788eb7804f749ca088850f4832c58b52fc3527b42db121a90a8b5e757"; + sha256 = "ce181e339bbf2e7bd6fa096337f430ddc3a7312084b0b37e86201ca6f4a382e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fi/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/fi/firefox-110.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3ddc1726866b9c20eaf5e59e55ffdc0f1ffe335b072637feab1e37fa75c71245"; + sha256 = "3d33da13ccb8bf01369a7cfac365e66fd7a126a7cddfdc382cab0f39ebd837e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/fr/firefox-110.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "738c5902dcb0cdab1f8e3a12243a8276dd1a5df34c9b6014b2373bc3a5c307f7"; + sha256 = "63ef12845924bff5f2fe4dd609f1d2c6d894a20f184857aa4611575550fd245b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fy-NL/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/fy-NL/firefox-110.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "701139fed71032ba9e0f039deebd51c0b212e656c19c377f081398d29a04262f"; + sha256 = "0d5b8b3f05507bd03f75d7cc79f69af8b9e380237f1e6729fcbbe2cd872542a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ga-IE/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ga-IE/firefox-110.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "449b503b56a53ed10bb6d48721be494a983884e0544a80d95433cf621d31cdc4"; + sha256 = "e24a5c3fc240e19f72e78526bcccf0a3a1cfef3e42df59d609e79e7f964f0b4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gd/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/gd/firefox-110.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8105073ef11ed62c347d2720d095b3a2faad65e11a50c6dd7c8b1d06c381eb7d"; + sha256 = "838cae5c08eb065729244109848915dcac64ca277a358ad3cbbab8b8bb96463d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/gl/firefox-110.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "faf007e32a4dc925d7695754c426f3660acc08ca772597648735b0c8d92e80a1"; + sha256 = "d1aacef9c19055c053f7e2073e67feeb11756eaa88a64da4a8c1eb5f81367896"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gn/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/gn/firefox-110.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "52fb45eeba6446a8fe23f976acda920a5167e8d6396c0e364dab906addff9e52"; + sha256 = "df7396073fc1f79974c9a6bf6160e14c3e879e1a95ebc7b55a2d090838b4b34a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gu-IN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/gu-IN/firefox-110.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7a4e841acc56dfbc34cce46ff8dbc0e24cec260b8567486dce7480b60af60982"; + sha256 = "d62f8911f0f8b9ce41bb35be881304bc86f8d46a787f719c0785e9ce3167bb40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/he/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/he/firefox-110.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "da7e501b8c1593cb3dee96b10f822615cfe58351d8f058228fd9af4e861d3a5d"; + sha256 = "e391741b8f92890957fc19a07562c1066eacfc85b7709f40e1661d85a9708696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hi-IN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/hi-IN/firefox-110.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "83dfe9cc2116c5fa780dcc6709a81325ff23314b726ed7b3f02fbca5621d1ba6"; + sha256 = "58dd9b75a2373babf90ed11c35c4015406c3c16c4ae8136eaa7ed31a59463c73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/hr/firefox-110.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "10f68c3e7672f6d021861eb4041d546663d6095ababca87e60734e9cfd09ab19"; + sha256 = "d5353e6526c23fd5f2d36e1e11a42548441ece638d57d5f85ea8228f86d87b10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hsb/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/hsb/firefox-110.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "18266c49bf2ef7b383e69d2f12a4866b34b592c6650c8468104d2c3274d6bbc2"; + sha256 = "e6d6bd0263ef9e54fb728e7efa44022841c44b76fb250dee12a87a8efa13d426"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hu/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/hu/firefox-110.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a67efddc94b7045c34e500322ae9138c60dece5df38b1c73c8a806a49c51bdc6"; + sha256 = "41e8264a840be20bc4ee6a34c7ad218821a88f629f8fa6fc91ba8e2ec1114050"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hy-AM/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/hy-AM/firefox-110.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3c3cd679598a1ee33cb85552cca8da37805e28bcbac18a1954c44479332027dd"; + sha256 = "b52304a41224477dc7ab0d4dc5546abacbeff9f159975df2a2d42c2298736d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ia/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ia/firefox-110.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e3a4b3fff1ac65e6c5013b33acf92bdc9a5d73be588969ae911ee57fc156bec9"; + sha256 = "354967f7324d42bcef0733b1d350deed6ced76b2b6d5d4ad23162235e905a32d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/id/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/id/firefox-110.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c21dbdd5fba0f80ec211c2d678c97c45c15d4c38c7a9ef2df3ebe419cbc159d7"; + sha256 = "660abd9b1514abcdb78944d01cde3ac095fa81f6876cf8c56bcf3f179114b44a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/is/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/is/firefox-110.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c0c4999106db151910a9092959c0e1cb1792f4feb1c06e391209ba27e59e50cf"; + sha256 = "a04ed13e809ff19ad73321809cf71f7ed8fe2f26e4568e218a3c1819a7a5df75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/it/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/it/firefox-110.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "1f4f9d9f2501e024e1556a81f86dadc53a15aa87ba2afd18e24c671f097bfc28"; + sha256 = "fae07441f3bfcd9177e79a9feda2fb3d2152c92b53ff4fe88b0301e5d7c694bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ja/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ja/firefox-110.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0418505229d99088fff72c145a9dbb54f893033dfd0688e4cfdca5d166a9b1dc"; + sha256 = "dd626cc4169556f7e9e7fc1f85bfbe33f942713d48e84cea42bb8d363a193004"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ka/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ka/firefox-110.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "cb2799206f8ebeac345dd3cf9cec63ffaab369c191b056816f86024eace0cdab"; + sha256 = "2054b064fd495703a19995cdf7bf6b397806f106d4eab30945770e5d29817574"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kab/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/kab/firefox-110.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8ae745f6130fd0be975662f1ca2f73693b2e6eef28495b154f1e45cfc029650a"; + sha256 = "6f80e7da22a579a457bd5a278650010f4a75537167f645b531a3518cd93995e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/kk/firefox-110.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "184448dc29505c50a9e8c0bcf0974c5a02cd91fce5fae168b7bbb8743b552a8f"; + sha256 = "2a113114873da048da7a7e185d4d08285e3a712e3d0766feeca9fa7217a40279"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/km/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/km/firefox-110.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b2e8732b0f85aec1cce3c17b7a01805d7fb63852dd2940ab16557e42f11e4eb4"; + sha256 = "198e4a3a22f672de370531e372cc317254773954e62fcc3dc8a2c45968669e80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kn/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/kn/firefox-110.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "504ae6d4df7241c99f36a59fc8d9fda35afd42a73e5871968e29a8cd052a7f4f"; + sha256 = "2b67d4e864f312eab809df92c491874017c9cf90a41ac018fdeef88bb0a161b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ko/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ko/firefox-110.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "06d8be7f8a727115819bc49fefe0a2a362f0598cb01bed17424c9a964b305cdb"; + sha256 = "465c96074960bbc5a6bd9766e474e3cea1250790626dc3c6b253b2b135a31d78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lij/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/lij/firefox-110.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "489089ee5f413ab46c69a9981625f5f07aa95ea1ba06fafcb8e9d14047255af6"; + sha256 = "bf0d174549261ff1d887712af476bea4a1380b38e9a3a78d87639794bf969183"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lt/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/lt/firefox-110.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "fe86a88921f10d76c0ed8ac1c0b4ac56406b9c8c09a9c212ba8f20f0be879418"; + sha256 = "e66b7c0bcce59c58d764edb218b2d3ae8f8b857ac1af157b10500b065d982b02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lv/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/lv/firefox-110.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "845c7bf589cac1dd0d292d573d939fbad9462f980a9d2d8390132a8dabfef0b9"; + sha256 = "6396aac6fce9f7d9b757d40f0701d1c99935268d41b02c964d92f72ae5e37e3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/mk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/mk/firefox-110.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "573f1e0fcd6053c64957a87fb9f5f5a48a3ee266eb712c9b09157ed690df0a18"; + sha256 = "81c02a8846a24691b4f03fd74c7319eb4103987c9ad9f31591a8aceaab4be309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/mr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/mr/firefox-110.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "9b7ea4b5f67ca110ba1586d2abbb506a832988e6a278b83ea6620fb0e0c7dac7"; + sha256 = "f42637f23ac8db7309d90c420a07af8ee6ea625889f3e49b2ca0d6ae0245068c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ms/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ms/firefox-110.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e4c035196bba510e0b0caf699c24683b44219a4d51ac9dfcfe7874afdeb4f91f"; + sha256 = "0ee5ed6a08c9ef01c6bd7c21759224d55ea898b53fafbfcffe2ae0712a0989a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/my/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/my/firefox-110.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "be04fcc80b42505922d564dcc71f59ad18977e8bcaedfdb051b0037650685abb"; + sha256 = "7fad4b0cb0bb9c93f0fe41be62ae061328c0f6a9c26cab2953b6520e6c28a851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nb-NO/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/nb-NO/firefox-110.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4b97136ee0f64b4e0978871b8618e5a59f390a1cdf14a857d7c3d0474278e747"; + sha256 = "23d0c5ca4317fdee30c3ab353f7e6a068a615dc8d95e6afa6c647a61dc446914"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ne-NP/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ne-NP/firefox-110.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "e1d3c4ff0d67c3f927e1846678d687f9b1fcacf2c810a228a263385d0844d151"; + sha256 = "46cf0f2b807c58c755fb9ee5684be4c729e1fe1da668515b81b9d1ba315dfd66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/nl/firefox-110.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8532106ddc363e24b76fa2d8326f88e98da2bafe588badef3b29658526aebfc1"; + sha256 = "4247d9653970f6dc22cd9d7721da250a58103ee80aecd960e4fed82e8bf0e65c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nn-NO/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/nn-NO/firefox-110.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a2e289e59aa8ea7213b771cc1c249406b28cfbf1624efa06bd700b15f40bf9e7"; + sha256 = "06d5db0844ea7c8bb20b1caff0a84e2ff85c16a9ad22128240e32dab577ad2cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/oc/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/oc/firefox-110.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "fcad2ca73437f84d8e500e329da800bd15f5758b99ac896cfa1d7eb2525a141f"; + sha256 = "b32e597d0b1f7baf283bdfed8e3e3b270ad671a5eaed63e3ff73672a84685e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pa-IN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/pa-IN/firefox-110.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ee61ee0a16045d0919407758261f749ab6d4a612439521166dfce0e9208f6cb0"; + sha256 = "592001a5e5b9770ea72fb54a8eb9b1a69feab5edf6490f908899762d91abfd34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/pl/firefox-110.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7bc34d9a72a0c9197bce9730262dcb9a254a40c27641022e854a37daf9756b39"; + sha256 = "101dfb5401ef5e20a2c83a306fe9c4bb9162302fb329260be09521f5c2dd082d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pt-BR/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/pt-BR/firefox-110.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7b3344c25a5ac842d565525dcf8e771da15c30fb936721c469e739b18f9dfdec"; + sha256 = "9ac950bbcb65248548041250467b7d56f60685959164d976c8b6ceac38046d58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pt-PT/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/pt-PT/firefox-110.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ac1024a1f0183960116b604f2d2a7abfb321f91aedcdf67d3ae9befe2b49051a"; + sha256 = "eb12861d3f0dc904eb0ad3759d7bdeea850112f4179385668c59b3dfd3ac3dfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/rm/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/rm/firefox-110.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "bd90d0110d0c5f1273f3d82b38e5690dfe7eec8dbfa29f9ce7627d75c495c968"; + sha256 = "a27b4cf3808a8eb306efb20453603837ae39a62b0f610fd16ff7d7302af0696d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ro/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ro/firefox-110.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "26f09bd30df370c65327728cda50206df8a0b9bb50d1273c81249cfaebae37e8"; + sha256 = "5038e3c2f2d90c0b2ba8567e8feb2a0ee5d7f378ef4c8d574b3cea16f63624a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ru/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ru/firefox-110.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0f9b03dff8c002b7a56c6d7f125d411652a6c1b00eecf317454f936cb887e4f9"; + sha256 = "c321a18c6943185868c112fcd39dbc5c1988e5b86a8003d3d380b38c53eefa03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sco/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/sco/firefox-110.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a7d2e6266a1e15a3b6e4bc851963ac7b2ccb181eb83a4fe4e83e99a56804aa3c"; + sha256 = "589df086f58957eaf6e89d71b498ee5352ecebb42dad73eaecf10e0ac81e37d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/si/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/si/firefox-110.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "6452b61aa8acde4d2a0bb82f8070357309a4a963a4aada36fe5460055a9bedf6"; + sha256 = "10e06894907f19fa226e2fd28f15755f724a7479313ca9ec464a232b296bfd27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/sk/firefox-110.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "37f801f1c9a0f020ce9729c70788024f0e71b62ae8860c3b301d95bebb89efcb"; + sha256 = "d8bd621d4eb313eb8b9b8a9a411faa9add7ece435a7ba02e09b15f082e50cd89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/sl/firefox-110.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0afbacd201d903aa3341477450977c1a233f2843c43e77d7a73393c34b342c62"; + sha256 = "7635f6fd7c12920b0ed70f4dc9e933559a6c5b7dd37d196904565057af0646db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/son/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/son/firefox-110.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "21c132be9a28d7c18d3045182d47a541b0af37c6306f8c08b8b4d28a6d3835f3"; + sha256 = "f079a98b6f83d43a3b5382d06c964b0b2d47a2cc2ed896dad4f3db59ee409f14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sq/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/sq/firefox-110.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "74d545cb511311c0d2648b994a79c5f63bf1ae6044638180117c38c6575dc882"; + sha256 = "8187c1fd7322d2f65893e0c62c487d3e01d241bb7e4a2debd880abf7464f4693"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/sr/firefox-110.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4e3d14eef5f10d9cc6d25c840d26445f1a26a3c558265093b76ebfe00e05f2f1"; + sha256 = "0419fd4b7d7b3449c16ddf65d7f9af42727aa2644d3cdb28082bfb49a7dd0790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sv-SE/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/sv-SE/firefox-110.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f8e98568cf4f5ed59ed662b2829354ebd7e9dc40bcceae5a5992257c125819b1"; + sha256 = "d42496c264ab9d5c90c7896cc992fad99598e34bc6252179c06f360158a405f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/szl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/szl/firefox-110.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a9727f8f1cca9aac9b608cfde33775fe1418ff9aab7fdc5229dca68c17314b14"; + sha256 = "0b53770e699141c9c365b1befb313490e8ae6dc201783b55238d5ed88b735c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ta/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ta/firefox-110.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8803d98769b0b634825374db86d63ed7d12936a57c62f77cf86599f8448ccb90"; + sha256 = "689bbf343c64f3c0fee2cf9d822d911f7a21e53fb23bde870d4eabb93bd3537b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/te/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/te/firefox-110.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "649cbbefc93e18871782a8134005b4ca6f89066ac0ac65f43e489f00535d6a5c"; + sha256 = "66bb831b25e589e2a199fd9dad5642f3cb5028ea4c3902c85921f34afc9d712e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/th/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/th/firefox-110.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6b9a1e53671ab8a67bbffe421c1304fd754edd7b8c30aa73876ac88947c3d72a"; + sha256 = "d35ec7e64aaa0c96fdbb0ee99a82de316315f193b4449b1c55e8c869a15051d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/tl/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/tl/firefox-110.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f79832e73b7d7cd9e34f258ba2b449e91882e0eaad368a8130d5a1e10ab0d3e2"; + sha256 = "59fb85f4501d381496a6e871db412b383634ca1e072a530429696df4058183a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/tr/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/tr/firefox-110.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b7472eb28a207448fbd3be48fa0a33fe1a495d3f10c49a90a1a53c37b5efddc7"; + sha256 = "bfbbef80e336020918154a1f2c40a3d3df054d0b0b6d38cb6b45fa54a072a818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/trs/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/trs/firefox-110.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a2ae5913f10775ff99cb5408a5ee06ff4e95711b7b57bbd605c1720d5111e5cf"; + sha256 = "97449e384a4e357ed9f0b7433862f34e76777891d5ea8917353a923688df8c87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/uk/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/uk/firefox-110.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "15837064ff0328a52221e64061e565999132dfa06543e21aede2fe86f74ec4f6"; + sha256 = "c3833e083bee37c549a511868b373515cf29a101b794ca9ed5dbd7e29eb48dd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ur/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/ur/firefox-110.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d04154c2e0de0c36f8408cdb5c479ffaf7c19208b6c1208a0b302d915375aada"; + sha256 = "a5367b3fdf508b0c5659b3d7e724cf78ce649bea7ef51bbc28e879f6843c8e96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/uz/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/uz/firefox-110.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "503ed687154d63d05a033cbe420171661d815011f7373fa32928f9c4d28e0a87"; + sha256 = "955f97064c6e5a34cb2313c4b035d01c48e4abcf7170b1f902f9022443336cae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/vi/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/vi/firefox-110.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ffc193551227f39463e25085cceabd6000bc4754929fa9071862339c9b8f0c97"; + sha256 = "f2442934a2709b13518250527127b6411a2075ac690971274880f3941ed41f40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/xh/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/xh/firefox-110.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "a32c9c7ceb2c38d2151ebcf4af15a613066f2965205eec3270aa42853a7ef341"; + sha256 = "611bf4e6350d5574e304638b799a758215d94ba749149aaa559d37c1f53de161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/zh-CN/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/zh-CN/firefox-110.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "aa3f165da56c9ee61d2c48939b07e6aa854e674571ef2dd27c83d508aadba869"; + sha256 = "7a3b9a6417129ac686cad52a1b941e5c5eb141d53e031667b3108f9c43958ca8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/zh-TW/firefox-110.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b9/linux-i686/zh-TW/firefox-110.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a697c3f1a075269589ff8c66387489c14b83fa3c4e3d773f9bedd9abb32caf59"; + sha256 = "f67a3f1d79daaca6337c307513ee846313872951e1c067cda1d292185a5892c5"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 65ea6cf6cd..a756078705 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "110.0b7"; + version = "110.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ach/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ach/firefox-110.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "3149d7d688edaaa71d2655c36eb2b36b114ca81ec9592148e277bbd553525f6d"; + sha256 = "cc5d39722e3e98f42ff5c2ccb269b2cde56f207f2d6f53ee87cd1f1df4e0d071"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/af/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/af/firefox-110.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3216a774f492dba8ad2def4d7796154615ebe3c09ee1fefc784936bb32b2153f"; + sha256 = "7290b02e275f45a78eab3cd4ca333b06917604336dff966db451d10dddf011e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/an/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/an/firefox-110.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "4fc5ef9bb0326b1a42a78383744a310d0ef27e063b525c9b0e7eae05c2ba8fe0"; + sha256 = "a0320cc31ceb1f0bcad216dfd12953d8b7ae0356236be2223afd79a1f68e52ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ar/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ar/firefox-110.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "624004bac8804d4ea1a0ba64b85b69af2273ebf47e9d073cf45db5fe6b4a130e"; + sha256 = "65c8404b0160ce88ff64076d6f8716f94ad1b7bece3424e2d660049e6dfb8935"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ast/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ast/firefox-110.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bea272fea8ee71e259b7174e70992727c96fe2cdb463c6b6f45f49d7d630aefc"; + sha256 = "b535076933c0d6b0ccbc98377fede33a4dc3b177b530b77904b1359b6d4d60ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/az/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/az/firefox-110.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8e8a635f6c4748044d195ef00196900b7164e8bfcf698012c7468fec41e05b4a"; + sha256 = "5d6d196a7d08fd59d6bde1b8e9adf8f0088011b0348c1755e47be0c5aa5bf221"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/be/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/be/firefox-110.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "de80218b6ede880e43a7710df08bba343f0038134a5209b363f2b48ff67679e9"; + sha256 = "7894ff185eac53a496bf1111e940ec53af1989c01f5cfbfb17e30f1be60ca131"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/bg/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bg/firefox-110.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "21719f7c5400b6c5e3ec23ae0a357528536c536f129fed2ca6d50dcb52661924"; + sha256 = "46e9cb6bc007341fb69a4e428ccb531053fc35ade15e73aa859ebda27da460bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/bn/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bn/firefox-110.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ef194e6f20d6c7ff9ca6e93178cb9ec7ef3f192b277f762b8d21c9d0348bece8"; + sha256 = "8419763e7310b5f7c3ec27e6c0ffb895d5b2c36b3c2cbf5261185e412d23b8f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/br/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/br/firefox-110.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c9e83011d1af6fa4cd16b25862e07e976a9b92d8b20488c53b7c6dced269bbc1"; + sha256 = "0995bb17dc38a80398cf4e90a0b238dfeafd5a0d6c7a48251222b9f33c7b57d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/bs/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bs/firefox-110.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2fac9965eedc5ce6846833e3d9ae93075e4526b71a9acd2cc0a77c859bf2fa2e"; + sha256 = "0a4f9be7ef766ea6381e4c66258ae415f45fdd05493d347e9fe602870dd74f43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ca-valencia/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ca-valencia/firefox-110.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "803b7d18d184f988b0c53ba50da1c454f95fddc397a8a1ce78e99bfdea318c90"; + sha256 = "3f0d4e7143d9f6f2d9f92dd886bacb7e381dd69623552f299c99668f8cc7f851"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ca/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ca/firefox-110.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5c85412de3767eb33b1f81402e99079617cb392f064cfea512a1f0932129ca4f"; + sha256 = "aa6fc57fc2cfe59f885bdd9fb9ac70a6b1d99f216e9ca59fdde82302a872a931"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/cak/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cak/firefox-110.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c7ce5177bc827fa356e95e75a66c7cb57785766a43618abda8b27c74ba669635"; + sha256 = "2e0ea9547dbbfc73da08f0b25c888ee8a05285c2e1b038facb6b60acd0735b21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/cs/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cs/firefox-110.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1c87e5cbeba84d10e26b8cb2260a575bd3a09d164305e79df79fd2e5ddf3de58"; + sha256 = "b3f8300ab4235e5452308a9e61c6f25f3b288e7abc75899c2edfde9bccb71743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/cy/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cy/firefox-110.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "05b6e4f546d8fb277fc01e75aa13935a58fc4f5dbf7d03e9e101e5261d0c4914"; + sha256 = "b1ff7f5b50080a0fd587b95855aa4378c77e9c7e9f297c401d7530bf62850897"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/da/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/da/firefox-110.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "50e0e667231225f9b39f8bc3f5d17a2417ea92c0deda485f47d8fc5ad7291f66"; + sha256 = "7a4b1c42e4a7868b4c7eeb2837ca23bcc98439a9082893c9b6a27aa794db1c3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/de/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/de/firefox-110.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "afdd6408e18915ace3b4568ef374303200c0871564badf7ac835b853dfd62b35"; + sha256 = "ef1d6041e6f259568d0ba689774cc68c93b6657cf482617c2c9b7977aa59fa0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/dsb/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/dsb/firefox-110.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "fc3e13183ab8fea4e71881009894bd11919bde6a7d9590c7e8289a90d9105628"; + sha256 = "be491c63b026a99a27f1fc07113cbac53afe2cf74b0c4a14e01b391a9f78afe3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/el/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/el/firefox-110.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "92f0b82a06bc42c765b7197d81f9f74083d3f52a651afe326c5621f0efe6d6ae"; + sha256 = "c3a4971667eff47902451e2a4ae61f2360dafedafecbb70d0668021e0136e210"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/en-CA/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-CA/firefox-110.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2d99cd7f37d2f7b9929ed20b2013abc654006d6e6bfb6f063b0108e08300813e"; + sha256 = "1c22322afbcf77b1042a88946313300ffbe28f2d46b9b746091bddc8ab4b9e73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/en-GB/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-GB/firefox-110.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dd768a7a686e9233e1fefefb7c049974784241663b4e2a729898549aa5070122"; + sha256 = "7b52499d9bef9c077411d78c746dd25f28334ba55ee116f04e655b1dfe79d933"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/en-US/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-US/firefox-110.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "aa7fdfff2c520bc78cc0e7a0a34bb4ab830a7f5332807398d10176e014dab24e"; + sha256 = "6f9a54afd92e9e4a7e28d9b2c98b9143c85e7756cc99814a6eec8eccc946ff0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/eo/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/eo/firefox-110.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "f89d84d6b39c04849a281e90dce354a0ad2ad0a39900a4bb4d9e991e361800de"; + sha256 = "8d233b59c6efac13a5df6e49d75cfe1d8c583e6fd480c7f3cd14a854d93cf520"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-AR/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-AR/firefox-110.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "87150f4958159ce9913faa9cf333648aa5ed5d52d64fd1ae91d79e7b06d1f65d"; + sha256 = "96030e4be739bb7ddbf71f1849b698e78de87355506eee026318a3d9e78d5062"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-CL/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-CL/firefox-110.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a6bc24603b2e2aef5277aeadbe639407ffdf5da7d75af871976f7984ba6dd775"; + sha256 = "8f1347c15674769afccc4a094366c744ee2e7cd2a72c0313b7472af2256c3192"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-ES/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-ES/firefox-110.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "039549d1b0f4d17acfb7d2b62a54dfcf161ff880420ff6f6df59631922df9b69"; + sha256 = "0380e298dbd24b19748d1c959867e6af16203868ebb46bff1aa45c83dac9d987"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-MX/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-MX/firefox-110.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "57ccc2d1bcacd0c1cee697d02b2333ac8ae9022caf39869b89435eb9e9247dd3"; + sha256 = "dea1d2ef28f783ab316354a3a6d92309d3906cf55a82e5a7ff7f801c3a512617"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/et/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/et/firefox-110.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9a1479cfa6e246ece5e4093076378536b6838ba656efadec744ed7b0883ff78c"; + sha256 = "83ed70566e1a0fb33120d9526ce3b14939077a1048054f59c301b33d07924433"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/eu/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/eu/firefox-110.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "78305f9504cb89c3ecea1c0b235cf0d3df5dc15853863b31b446660f6c300eb6"; + sha256 = "0273dbea420a77a3f3331f5e80d3302b8d488f5bb421e55d9b3675f80132ddec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fa/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fa/firefox-110.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "39adfd21e57256ae8befcd7f39e9628695fda08a57fed972dd623d7e0759d9de"; + sha256 = "0f5a0f2614dfbf226855d9f1f4ae2b239ff884b7c4bfc4b1ea9f71e5681613db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ff/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ff/firefox-110.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "11c2d2fc7262ad9074d4842ffe0b0981e78cdcbd34d658bafd61457fb5b8cdb7"; + sha256 = "637152fb27f03ad574db2169ffdebdfc5bf1d7fc8f9b8573994fbd854e8c848b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fi/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fi/firefox-110.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ec2a6eb8266c5f8ce56056a322478d308411c7cfeecfb0e6528f3464bd6dfa41"; + sha256 = "538908abd12b8dfc8beb583811fb1629e496222463f9487ba3e988da2b0d1ddd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fr/firefox-110.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7b1fbe6a9becf5c4fa27a4c74672f8408e1028998a609febfc82568b0a0fce1f"; + sha256 = "7ba6d2259d7a33a98834fe7ba3f565ab5a412af0001d83fed5c449089a423fc9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fy-NL/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fy-NL/firefox-110.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d9be3385f0bae85c481d48a3246856ad160e5ea932e4f9ad763db98a4af1fa06"; + sha256 = "1ba376f24244dee62fc296ce26e82db4f2dc27a73762a773eae63b24634f7627"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ga-IE/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ga-IE/firefox-110.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "16fd254951cdb916cc7db0eeb64c14a291f8e4fea9fa4d936bb99cc4f5263e6e"; + sha256 = "ec0d2db7e771516515014f560635b03519797cf040c9ac53fb0bead6c553dc5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gd/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gd/firefox-110.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "037939f4a9be6bd265e7abb5d85e571e4c7a49334bcd932d279f17654a4f106a"; + sha256 = "cb20591866003e56ae1b9c99a0c124754e4a3dc2798596c2629eba16b51ccaaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gl/firefox-110.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8ea3531f711c78066bd79768bc2f8ee2cbf3974b5d2a6a15ad61cdd488a42798"; + sha256 = "a29e76b31f75aed4df52dd3fe2f9b5d7a9649e010eee36f7bb964f988d980270"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gn/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gn/firefox-110.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "d0d8a5776190ed28b92dc2429ae75ac6a25d48bb8217732c7fc246b94acf68e9"; + sha256 = "edbdf1000de809a5bdd0350f1c49e505cb593273734d05dd3ddd46710729fc78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gu-IN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gu-IN/firefox-110.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "9997dbcffcf81c275302d8e8b5d025962c71b6a9c75fe7bc507b101eea260d98"; + sha256 = "570089326d80d06f013111020e6dcb87563b78cf0f5a6cd69552fb6d86255752"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/he/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/he/firefox-110.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "0b5eefce3516e6d5b7ab572a0940ad5c8ef1c8528582d182ef56d8320ef4a99c"; + sha256 = "ce35df979ebd3761619174de68924dff38b4ff65a150167db195f8011bd2923e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hi-IN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hi-IN/firefox-110.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6b1905b83a7afa4c7269d7bf88351c26c9081945090cbb497869809d91be574b"; + sha256 = "b0793b48235be330e2ed749e152fd4a5f8f76fea88e2b4e192cf2c2c1a3c3c08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hr/firefox-110.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "324e55f1b4fedaf1d20dd9acc13727e51d6735c377ce58237eec51ca4c937ccd"; + sha256 = "898793ef521956f564474d490beb0e3a77be2b6c20d790ac14b20e6279075864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hsb/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hsb/firefox-110.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4bf345897057ca2e215e53a50d79e45418da68c67090bfa1734d0dc43f4beede"; + sha256 = "bc4dddabb277b88180afec6c956488315e95b4e31a95f0969936f85e3adab5d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hu/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hu/firefox-110.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "eed32aa30eb35a074c9dd00576af9c4c2015c0487a02c0b66ea8db3095bc59ef"; + sha256 = "8f9e755fa8c7b9173ec6e6d19fb0195e80e9884434812ec7b4b61f26596a3e95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hy-AM/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hy-AM/firefox-110.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "320f41e8de475f5957ba9547cf844ac571bad1ac6f991ce4f5ad87cdc26bf9dc"; + sha256 = "db36bfdde0fa2b148c05d6e2ff147f1cdc3adf2bea469bb13057e157fa80c2ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ia/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ia/firefox-110.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1e4348f56ec630f3969dcf4aef3ab263cf58fe449314928e5a4963f6c7ebfae4"; + sha256 = "d2cbf20c9e43d8332c1fb24958e281438be856ccfa7a4b106e2c9bd95e4dc065"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/id/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/id/firefox-110.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6c54eee1ae9a361d49c6302c3a710fbbf0da51bfc54967134392c58eaaa9372f"; + sha256 = "14a10b4dc15d7e910570f941fd146d8e82bad752557e710c8c676f427bd289d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/is/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/is/firefox-110.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8f40d12a2782845eb9b0565f1237e9b86eb750efdd420c1a7f1cd17d76e67d2e"; + sha256 = "fbbfb16a9525665d9c7212534cab21922f547f0992734fb96ddaa4099914b0ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/it/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/it/firefox-110.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d81c438b5ce1a124ebc4a935bab22a06fb4b664bf50c6158fd75878f111fecb5"; + sha256 = "e8d3c681149aa041480165eafcaba09a6a05fe4f8297d068b97899eabce9c2e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ja/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ja/firefox-110.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6f20bb1b75b13acaf35a626d843842a804fd6a749020076dd783a2ebb8adf7f0"; + sha256 = "ca9ed83b48cfb7218b718af754a091d2ff7bba146f76f01181ed4be1b581a9e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ka/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ka/firefox-110.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3ee2d13788a24bc9ad60f3f85eec6b11ee82bdde223903b73ae681ad5a0c8216"; + sha256 = "cc05de864bc532d9cd659b17b486ae6ff4ecc9f71ccd74d34c51cc35018ddb65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/kab/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kab/firefox-110.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a42be81f1df3a2d18818bfc8654cb9cacf7602bab964509392d62439b3f67adb"; + sha256 = "907b54cf52376a82652926ee91b12db7444e481aec18733d163eb4e9ff29f814"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/kk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kk/firefox-110.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "24f29b0b78df615942c6984e160e9cee60552efbe9246ed290b6a01922b0116d"; + sha256 = "5547347e1afcb9a65b48be27d44323d104d9bde2b47509e79c264df257cd30bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/km/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/km/firefox-110.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "02cd6c8124331512fa7f57b9d165e1a189a1eb92923b0f0264fdb6c1b2d4b753"; + sha256 = "ea079774e5f57b38e617cd2675a1d4a98bc890b02006a7632914bd91de42f2aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/kn/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kn/firefox-110.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6fb11c1f5883f215cbccd22ab61f0acb72ca6860e93918d61f351ce1566e98ef"; + sha256 = "32099eb48e8f1365d8a958fdc9acbf9e8f74822289aea5c180ad7cd557095ac3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ko/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ko/firefox-110.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dce0fded8256a5061fb335cf42821cbbe198078390f7d417a33be03979f52b67"; + sha256 = "8f0aa7bad3ea61a41b7be760e4d7d720f694a1480f3ed1d7006d96cda65065dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/lij/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lij/firefox-110.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "22ef4a8396ba5b3ed4eb9da028ec8652ed9999f42e2c5c6b409e7fdc45d17e96"; + sha256 = "21348cf4a7808eec0f42cc4afddd01b103d4f289d59b8fe36022a625db89278b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/lt/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lt/firefox-110.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "55f9842ad40c137e70e306c8270435d5c22ea83c611e6151890e5cd2166f1b1c"; + sha256 = "5a8d6fafd65e90ecde3000a1fb7724ddba69c3f08e86ca2a5ad841994eb4971f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/lv/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lv/firefox-110.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c92b0d98c2a7ca81ca4f5f16d9a387a62e0992cd65707a3a529d8683541f298a"; + sha256 = "91758b8b14251fb17bbdfc6ee12dcd1c677c0da8e422eda05ac896e436affccc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/mk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/mk/firefox-110.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "110f76a05dc366e50342be5e503d64112d2798ebb92267ef6aeabd18a23ff826"; + sha256 = "49c08e7b1a57dfa10325ee65cf155d64f9e08190bae2487431f2a91d64f97446"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/mr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/mr/firefox-110.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "85623b9e9d69d7ed501752ec9b5863f8bb8390f4f53d7ceaf1497cf442e6978a"; + sha256 = "a11875fdcf2a93dba485e72b1fd908c14b43ec97096dbbe78c37ac5834f06f1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ms/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ms/firefox-110.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "80b135385d8f622ab9639fdbdd119717d7a1c5fc105469cab07ac31f82a2e9d0"; + sha256 = "b4664837f25808a7e0f9a3e9570e8534f1a5e82fbe51137bcafac91fcb8ca737"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/my/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/my/firefox-110.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ab6967da3bc7028ab82b57a41469488a74394b7fa914a52c2e7dfc6c5edd08d2"; + sha256 = "f345e87b07fdb431c4c69f96e83fcfd4aaeeabcbb0fca6e6d3a71c263d710b65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/nb-NO/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nb-NO/firefox-110.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "cd22536cc93a47c78d41a3ee78415a3f57dab757c61719d31a70b172fef093c2"; + sha256 = "006ef1aa2500a795782fa9820886ae7d201ed7380cd488618e9b5eaf3263aeee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ne-NP/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ne-NP/firefox-110.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ee9b171561f09e52fb595135234803d95822772b722da5867cdc41ca43c8d03a"; + sha256 = "dc9a7c502bf5395e7976e3160865fa8360b25af396976ed95c21e8bd84d8226c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/nl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nl/firefox-110.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "efc83b8b16496033943ae70f5c572319cac9d86c826eb64889f2b824e1c0aa9e"; + sha256 = "d9753724c425d3c9cadc20436a8995f591720c30668f0453b036fcb65b67c30c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/nn-NO/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nn-NO/firefox-110.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e74a0ca78df08e63ddb3162e71a22cab7200d5f317cd2eb936305e17b053ffd5"; + sha256 = "6e776774da71652b62e4daa4b4e4600ce2ca2eaa68fd41acc127fec17a21e0a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/oc/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/oc/firefox-110.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2ff7f6e219be38177895ebc30a511286d645120728caf4157b2d5fc03c4882f1"; + sha256 = "5f3405900c6b81198efc3b22ea77318e3fdd8984e0f6410adf3f66f7fb39eda1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pa-IN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pa-IN/firefox-110.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "bbe935ee5a13b42e6bea6575f54930f44c8ff2d7e62f9ab4391baeda26bffed5"; + sha256 = "5efaee9f9eb16fbf1b3d3d0bb4d09c0cf451dbe9dfc27d46e85d2d80c1b838ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pl/firefox-110.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ce270a34203fa987a312c96c462a414ff65da9564b01598f1183b7f920bb9216"; + sha256 = "65b9e3e1155c4325c827871c1a236932ab210fdc0384078dd5f827b7454ec5c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pt-BR/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pt-BR/firefox-110.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a082bb58d53c57d4728d49207e606ea3b79cba8e57541e098f867f8bfb76d6a7"; + sha256 = "f23cb718e99fae10967cca330ba6bb6a28293ebdaf9b6681c3eebccbb8555281"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pt-PT/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pt-PT/firefox-110.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ac696b2b104a3995b1b0f29425347c4d47277d0bd2786180ac4d6ef1f9f7cbf1"; + sha256 = "c0dcaefbe0a00e2ff8300dc6b23f25cdfcf02b80f43cafd0f5c23db91635a784"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/rm/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/rm/firefox-110.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "54841eed47416b836be393bb625152bcc1267cfeecb2bcfae8e67b012505b31c"; + sha256 = "1cfea13a5987f28820caf577927cf464950735ed7fa23c05ba59e0ce41628146"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ro/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ro/firefox-110.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f074ef2c5155ddd0562a3bc8afe3a3562e247b805dc71c1e45436f54025c25ea"; + sha256 = "82c36e3645da1a77917a8ba3ae00ffbbf82094cae66d62740da6d847e3aac9b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ru/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ru/firefox-110.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "cd16f9972b4e748f8f2a42acdcd2bd3d81d642b7261764a1f49e26b60933c180"; + sha256 = "c48d252b64961ab476ccb8a85cf5802941cbe90448be72d8af69a31a952962ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sco/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sco/firefox-110.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "2c612a1f2305384f4caf6b37ba57057a7fd9efff5d5bfd5d0d760c2baefe55c7"; + sha256 = "8908f00ab128111535f872463fe3a7e63e8bfa6d35af31169d927464fb5097f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/si/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/si/firefox-110.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9abd847f93124ebdd50479ad38317fb8087a85a9add2d4e44ddb6f2a765207c5"; + sha256 = "eb069f23422fbca8df06fc1382c684e74c6af5dcd01b58d9d6e190c21a8bc493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sk/firefox-110.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a2c001910dc0e2d8b3d864e7cd23691ef13f7bcac15fe08599f38533951815d4"; + sha256 = "c485954037807b81acd348083292ae4fdf779727593c9a1fe97ed094a29ddc15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sl/firefox-110.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "212f7dc19d62f8ae4b49eacfe87c2d3cba87da91b88cbf6e8bc4dad05b3ecc4e"; + sha256 = "c6f506b0d14582b2db01e766a9da73c3b9385eb60782e99aadf5807aedb02426"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/son/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/son/firefox-110.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ff6b3e368980b4325ec0e02948e0aef6aa86cc4dd5d454a5d6a2c50a790d3382"; + sha256 = "50603367de317c86b042a41996fb47f35cb7758e1cf3c48149c4a892e31d6381"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sq/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sq/firefox-110.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8e343437ba5a4f030b629882b73a0c23b2141f4ef5be0917444cfd9caf53edda"; + sha256 = "26b278dc225b3bae852b74f81e8898a2b5f30cfc242971683d4f21a345f2dcd7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sr/firefox-110.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "65da36df28fa13643773c1fe0338d63731e61c33fce38b4f5fd90e2793c6e210"; + sha256 = "70032ae28bdcdb00d8a2b9528d5d09dcf67316fb91ee411539c59f3b3b6a075a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sv-SE/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sv-SE/firefox-110.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "19c7a44a670daa2ef9167105858ed0a1a7e03cd9cd2bb5caa3fd6d048d91f2df"; + sha256 = "10fb48222a2ffe31576784973c305d02aee180044e11298b2b97e772c8518933"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/szl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/szl/firefox-110.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "d808d96a5fbbaf1a9dd72b2fde9bcded5759032fe272817fd5525d30e666acd9"; + sha256 = "13039a67c2cea4dd2c128665e25bda28a4334465311417db6ee71846c440e754"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ta/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ta/firefox-110.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "fce003993a6d3b45b041271a33272f3fd8aa954ad150a96295013a9943da97bf"; + sha256 = "66aeda2367e34915e9ab8c284ddf4f6d10d217654f0aa6663e50bdcf3f4bc2f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/te/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/te/firefox-110.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "26e7d6c2df59f608d29763eaec24aa6f66c1f393f4b578c4e31fbc0b66d74872"; + sha256 = "f9a617f3fab610d6600a7cc8b118785ad77b9cc0447f89fd55f2f4acb4444226"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/th/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/th/firefox-110.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e78b62b3a74aa1a6edc65786376cbc69ffcee57550f7bc01aa6eb1f3348e8049"; + sha256 = "4d4194bc163d7ad55cfde98cf2324a6a719b60c54f27a394c58977582c99989e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/tl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/tl/firefox-110.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d9e4e1a157bf0950b4f0e4a4bc65e0133712c7808bcd82bb7c2363b22f84f928"; + sha256 = "fb559731bb3226c4963158b1cb8332dac7e71c0a975429e112e456f2a9f3863c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/tr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/tr/firefox-110.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "60faecf8397c5636f408f7179be02cdd4608def2f6e2255d0a6b4d4adf691255"; + sha256 = "0d6e05a3993673ab612319e3b287893193480a0a82bd3e1d0f9adde5b7b43c03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/trs/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/trs/firefox-110.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2482b5c2a1ffa5d0c4bc0c4d94aa2570fffaca5882ca5d2dfab32f4adc999c7a"; + sha256 = "2bfaae0ea692e6d65787ba6751e24802dc458e0b17e1972290574d612536a0c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/uk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/uk/firefox-110.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3cae3562bc6b215886c829ced2f7983bd86c2b471e6816a4df4898ec1bdbe938"; + sha256 = "410016df2f79e3a14210686ca594f6994bffedf73eeb37d536a9ac206e731e50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ur/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ur/firefox-110.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "77ba86200000852daf8530168ca4769679003a81688c044a5a44e817a3bdb573"; + sha256 = "cec6bf39cf4893c6430ce679b9f3115308cc846e9008083bc97ffd731885bcb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/uz/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/uz/firefox-110.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "911da79e7cf5d63a35c7410a0a18143d919109e0dc2823fd9caa88cb3b2c4589"; + sha256 = "8a7d363a41ac5dad399a6215186affc9a4a4e4fd56c75f5ee0d43b0b08eb2739"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/vi/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/vi/firefox-110.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9273b464a55cf3b4b8997bc54225e951a94f969ff83273316082102111e9b7e0"; + sha256 = "187e08e5f39dae028c6b0d819eb570f4881171b6432fed2cbcbc732288a98b96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/xh/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/xh/firefox-110.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2c94b9461dde096ec4fc73eb3c024613ae57d17fb97220feec5a9de827d1e19b"; + sha256 = "1225b62db14ddd681b1aac4b40064c9987a1138551655dbc5c49f12b8e47c80d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/zh-CN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/zh-CN/firefox-110.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c150000b9739aa32e3f5b9ed256550a0b91d14ddd6a3f88913171a263a11a843"; + sha256 = "2ae18aa0a672b35d15265e26bcd015bfa93ca8fc76911301ac1b0fb214fab1a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/zh-TW/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/zh-TW/firefox-110.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7b704fbf8e7d3569c5cb7f7c2bc1548781c6d4d3acb50a4750c155dae8b610cf"; + sha256 = "91a601746d936b09ceb20c6e71b2e66337cf6dcf73a5a8a49e120b242b9fbd09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ach/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ach/firefox-110.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "4eb5efe5af863bd2106879a9f4deccf254adfa7b6231299fa9491d44013c898d"; + sha256 = "4b6c3439750c59a389a92977502b69d21823aaec8a8a369ccec947cc0ecc6e11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/af/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/af/firefox-110.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3b3362676e978b5521dbf251a51816d5fd9bc3ac0fb68c672d54442b38118789"; + sha256 = "40fe16b22f74bc2b03e46df4845158b6f5da90eedee86a41a2d65e1212bc6f1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/an/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/an/firefox-110.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "41fd6dd1881cc260e63cd26ea1621a0d8d16702d6955a9bd918f3b05835b8342"; + sha256 = "efd1f055797cf33cafa891ebd6bccf159f65086daa56ef82d43b4db54f37db8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ar/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ar/firefox-110.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ac82d5b42a9a48f6266d5a9d2db48793b77261735d11ed5c6d106cbf85b2e4c5"; + sha256 = "bd9b5d1e9e7e3abac4db52e0c37456dfd5a4eb56a8ac8b0505fd04c0d30df6a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ast/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ast/firefox-110.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1c980a29e760a669fcf41585cee43398761103703bf7548efb666affee3288d3"; + sha256 = "12238eaa1d0b07932dd8ee5a9f80e8997f7ac53dfaac3f444935ae5a6f4642e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/az/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/az/firefox-110.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f3fdfd74aaa5d02ac96d6fc2071a2dbec5a424f1263dd3d406e520033c811b88"; + sha256 = "dd97327299ca2972451a94ab969f6242e1ee80b5b5f8b4a8d3afd7a6c4df0ffb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/be/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/be/firefox-110.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5c878775746f8897754de3a5742ef3b88e743bc59ffb8f073ca43fe85d3c3733"; + sha256 = "95c5e5c5dc279301b4110d32f8f6517567986522c7fe5f7b23161a3e8d74d141"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/bg/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bg/firefox-110.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2485924a0a2dad6a43e59b3c59b833000806770a4c170c9c9fe8818b9e9456a5"; + sha256 = "5733949bfd0a8dcbec55cbcbf2cc8cea9cb06929270559dce8ae0bf04aebb82c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/bn/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bn/firefox-110.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "7ec788d014d24984c4a91740ab210d306dca6bd991b21f000a7ec62eb2922730"; + sha256 = "9a8e143e9038dd6028a7da697d72ed9410cb839e635dbc30b0ecdb11b0759bfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/br/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/br/firefox-110.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c3abadb8c90f5def1f1ac66a1f57f8cb72142b5bde767f4310aabdb9b19b2af8"; + sha256 = "7d87af6eb4d45bb0c3db1469c000a116a5531ece9767e5d732f5fd5d44873d34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/bs/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bs/firefox-110.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "dbcf629d2bd023a16ffda05a3068c78bc0aaae9c16d23bdd46dde5ed3623102c"; + sha256 = "59958109f2cd19548c76a03450f77737f1e793f1d14490d501990e5243640fd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ca-valencia/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ca-valencia/firefox-110.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "fe6eee93d3f1299dd39c1cfb7f71b56ebfe76ff565679e24e78e9df48c15a05c"; + sha256 = "e830fe6e33bf8bd5508d1f31a51b177664897719efee4bd80ad9f1874769c541"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ca/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ca/firefox-110.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8b6beb770bf10e37e28f7fba3f13cadefddc54ab461f79158cac3dbcc4c6d189"; + sha256 = "e5d84bfa1395fdf797f4eddeec0f99fcf6138012afd1ca9c4fbae4031b542130"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/cak/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cak/firefox-110.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "4835a7f7e0c2aac5e7cc515b438f4ec8eef747e8eab43be27329d769111397df"; + sha256 = "d9c5538b25a0c277e61b6ec5bad760c203b45ab8f607de3620de6337678824ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/cs/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cs/firefox-110.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5fbd0659bcf911f4227dbfac889f02515b2108e59c246b16bda3bb80855cd21b"; + sha256 = "bbbe1ac4e17bc1c86cd35e990f30a167ade5d3e50b2b739a35b81ec7ba44315a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/cy/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cy/firefox-110.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3c20e9871614b0173a44f8f1d1c797de2ba1065c5ffde4881fbb46b7bdbc2229"; + sha256 = "b42bf9a0093006a9580a4b7be0d6211fe7d73a4cf92d73d11c8c6f310400abce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/da/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/da/firefox-110.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4af7481914a29c321ae5ef1f6b1a1b72bdb62e0ca595f35f051a3968e0662580"; + sha256 = "c8bae91a80832cda174a9156ce4f5ea8f27d1ee951ec2248c3a14e95814cc4a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/de/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/de/firefox-110.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "04ed988e98f93a3938f03151e6df9594def3c406473974993223f907077fae18"; + sha256 = "6363710caa0789a1c09579919a4303f7738b5dd79f4a975f79c8aebcb8ff1c43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/dsb/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/dsb/firefox-110.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c44401b4ff9bcf06c41723de20278848c1945051fc8ddfd7031bdc3d08a27470"; + sha256 = "f7806c9e4f73bb9176e6f37f00ea945b246b52b13d486819298efb49af5ddde4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/el/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/el/firefox-110.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "41fb2592795c60fbb9af77e880e97a61055e9380b01d1bb7def76a1058bb741b"; + sha256 = "a25be78d906d57d759cf8bde280f1ee813c88a2f40b5977de944b40a8a3b1cb1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/en-CA/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-CA/firefox-110.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a549401e7357a0dc505342183a8c0f20a220e034565888d76e63998523c21944"; + sha256 = "8b21e8635b1e3e747497d431e974e764ca35e662417200120669cc55b22147ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/en-GB/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-GB/firefox-110.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a73359b22d92c21c439745b1d7b7c11dd562e9391873e1f6413280aca9fbfcaa"; + sha256 = "8cbceca22e3a3d3541ac89fce5fccdc1758469258df28e0b271ecbbc162ccf9b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/en-US/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-US/firefox-110.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8f7876555697b4f853924848cec86c480fcc7d6374df5173a14d4694d0a26f24"; + sha256 = "380e5d288bbe0d33a144ef51059e0dbfa8586b8a17c4084a9c00b11a66aab816"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/eo/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/eo/firefox-110.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "fe9d258c7795bc543e32df33fc1db4f39eaaad543fc6c06620de2c86317564dd"; + sha256 = "d0b7e7a4a5efd7d86eff1f5e5ead40be5c878f1ea72e7ee7d23c385a38a69a64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-AR/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-AR/firefox-110.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "35b687901ea7499b9d91e14e13549d4269db4ff11aa1c3a4cf7a0b169c781e40"; + sha256 = "2434f4d2522614f2c6e12aceb84a4148577eb0e8f86b55a8fe6b1b39ebb03743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-CL/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-CL/firefox-110.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "fee072e0890c5ce4e88b2ca385177182bca52f21a9e5689c4886a08734c09844"; + sha256 = "f54355926490abb8ba8499563389702dc0ba40c793f7de8da188b47a95f397ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-ES/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-ES/firefox-110.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9b23c740a58ac3a621d6afefa825c4698d263222a31997b0d1463c13b8a88f18"; + sha256 = "22aef078ccc04844bbb59de7b1226ed3a4435f2a46448ef0ba7e9796c69ac2f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-MX/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-MX/firefox-110.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "976be15d7cbd1e6dbbc21cff035b1ba79755c1c7b08878acf73b611d179b58a5"; + sha256 = "7ec6a9ebb479adff3fdd894a1992e1377cd8aa898126b7a51d7bd3e8c314a2cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/et/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/et/firefox-110.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f5aa192deb8f4063888c4539568a1cfe14ac5efbb39890be0f626a44184527ee"; + sha256 = "5c6d7c0148d66da0fd6394a38dc1052df059a620285a8277b0b166b57f96e3d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/eu/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/eu/firefox-110.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "27a6412ffef8191fe49f91f46981bef4eaafdba51af751b68ca784f425181572"; + sha256 = "16d393fa5ca5bcf93da4d1e469a025482850b88067c0cb601e1a6e0373bfe4ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fa/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fa/firefox-110.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ffa4e932d63aa0609de12194b97e9812eeda9d9995e85cc3571bf22307b551c6"; + sha256 = "a7b2e5e4b4d3d43757e34ca07de604a94a1bb069e030e3dd5d1e8adfb5446ca1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ff/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ff/firefox-110.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e1bc2f4df952a0bcdbd94acd5a4ba9a147ea0625b43f1c2c2516c2033c493a0f"; + sha256 = "a818607d5b9faa7f10f1b887e3d7ab31773e19ac4fe1cdd902d71d93148b9e34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fi/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fi/firefox-110.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f7b426f07cad206f4ebfed3f7572415659328f91b2a892c79849a95391ed07b5"; + sha256 = "c8fa7b5af6b02f9cb4076a0ae213e75d386f0740bf8f4560fcfdfe8b15ee5bd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fr/firefox-110.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4724ccf94bec086fd5fd66368b03cc20c9ea07859113c9ae3d36a15aa9fb5fb2"; + sha256 = "8eec0ed9afc6199bdcd7ccd1ad9742c5a06ad74f04c617f828debac47f81b623"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fy-NL/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fy-NL/firefox-110.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "13643cf94fa7ae3ba5fbd44a7d4f7e4d05f0512711f14e7eaa1387ab49a99cf8"; + sha256 = "a91d8e6b007264530c829ca6d49510f7c452cdfa2cc8bb6939a5ccea1ec2ba44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ga-IE/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ga-IE/firefox-110.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f91a4493c6155e6f087158ce4b426fe131cacb558ea7ea0e5ce6eff162735f9d"; + sha256 = "2029d5533e77417d4e696872cdd3f95d06120fea1fb50d350e62d65e85e71765"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gd/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gd/firefox-110.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "41a9ef5fa0b2744fb6b92e14e85cd5dc4f44a7c7ce8af98a1a3a918d61dd0deb"; + sha256 = "d85048cef87445e131f0b0cdd25739cc6e792eaa3520b583fc9231182c2a00c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gl/firefox-110.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "788f9d3b57ba76f4910e0d36e6fc85e8fc1db04f5522fe166b3c835281a3d1fa"; + sha256 = "3a4ff2e4f8f4bbb83db4dfedbf2584ed1db3250c725d3d834926ff8e1129f3b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gn/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gn/firefox-110.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "3dd1a7503e4586da4564ec849abc92e2804967ccfa24c2ac97ed0a950ab8d437"; + sha256 = "f0a92cab7f2fe2b81f92d3c17ca43d3a7598f7ed879a7ae4daeb303500a5c5c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gu-IN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gu-IN/firefox-110.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "3e8e2b6845220caf1b55627e3015dc9b730ab5e3b83c89404a99b7360f635667"; + sha256 = "076dd689e5397f0a347db0ea50c328e097e1fc75633ddb65867ea2edd0ec8a4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/he/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/he/firefox-110.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "bb10af6a2bb65524549d49f4d9ae997f5e76b9fb7319a7c799d40024c9668103"; + sha256 = "8a32c0f4b791f6036e04776229dd4676615acb5778800bc8b227bfcc19b5516b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hi-IN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hi-IN/firefox-110.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "81007114b51ca5609b6e396bb1beb50f4aeb34932996e6af43f2f06081a75a7c"; + sha256 = "cea795afbfc273f27cafc9e57ea2cbd2ff66fd527289a76e606d55bfef1c2c53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hr/firefox-110.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "35b3a5ad77dd74429626d25b8f103f5ebb4e2d6f820f127cd4dd5f1f3935be80"; + sha256 = "c6ad7e4b6aa871ab89f6ac9d592fa624f081930f9846e1b26b8b9853161def93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hsb/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hsb/firefox-110.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d1e58940ef2a555d4da136faa65f107ed14f2da90581b5a347222f836fdfb484"; + sha256 = "38bc020e7655190a60ca8b61335c5a17dde9e258a7829e675257e932fda8a98a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hu/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hu/firefox-110.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4a14463ba65c108f9db55af7722c33a41d3bc818a90006ec0dc8c0a137d8fc8b"; + sha256 = "b09d278de29d76c2165b7c69fccd9841cd4dc8d38f41bd0321f9d19840bcd3c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hy-AM/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hy-AM/firefox-110.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6b23bd00965e7e2bb456c82f66dc931b93b30aff9f32cbecc548a86c12003577"; + sha256 = "3da24edb261b08399afcecb5e7dd87209655bb80e990f31954f211aa214c6682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ia/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ia/firefox-110.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9b021296624e5a73a039d7eb41e6d8c67d0b29d391ec91f2729f572fa626eb62"; + sha256 = "d0c176e5ab1cda84944b708c0c82956e244b9fe8fe371976bbc00a752605eae9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/id/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/id/firefox-110.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "453984cebaa6bb6324bcad3f89816207b113280525e6c551a1f457a66d471b2c"; + sha256 = "191547c29106ded2b7aa4ac8be95d70d6485ed934b7d8f14e92660db413eebe9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/is/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/is/firefox-110.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "136d6a2f17693569b2b1169b4afa7e4bd073b85758993a82a8807f47aa3c0eb7"; + sha256 = "d794ff4a91ecd73a199d31392601817108c3e60d7dbb23620abff361b064d2bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/it/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/it/firefox-110.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b68387a725f930a3c8714620a80046f4ad13334046bfe186e5499139e95bd919"; + sha256 = "0f2f16a7d4a1f6ae71f403211d9448597fdb6bf179846e425d03d823eac7b995"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ja/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ja/firefox-110.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b46a39f4b36bdea5f1084d2c8b61d75aa717e6926c7f343348dc22199b141fd1"; + sha256 = "2ca0bc651b02daa555ca4a065454181e14096da0c375a181d2ff87fb2d2ed1f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ka/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ka/firefox-110.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "25a44788f981a713b66155e17ec3226dc3c7514a1edf4be02659bd43caf7fefc"; + sha256 = "4f941d02ddc7a1222418565b243bae82d0d214dbaf2040280632ef2f5c1e734d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/kab/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kab/firefox-110.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "d795e5d2396f24d43f1c24ebe18c1561d391d2859e7bdc6759f65cbab97cc3f6"; + sha256 = "6c53d1419966645bcf88ae4aec7cf858b91c1185d5041cdb04e822931dac4bbe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/kk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kk/firefox-110.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "e5bbb12d574c7d6460ebc0d704d0fcf47fc034fbf76e7ecb0780479777490a94"; + sha256 = "934e6b854b47155cdc46e189442fbf41e1d1de2ba828f3c63009c3a1d43ff29e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/km/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/km/firefox-110.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "db19e45151808183201a5526d788d72929f46ad958ab20d87a29792eaf67e104"; + sha256 = "6809d8143e23e73861a3ac998aabc12027e91cffd8e963a55da041c3940365e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/kn/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kn/firefox-110.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0efce05c5b640d5772a212b82a949c2c64842e85f42c31f3d79b87572afc5e03"; + sha256 = "8be5a243efc4887a44a3440bd3c894f0c45a67fa510bf1648f44e5640f0d44c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ko/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ko/firefox-110.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c83f3d9920ed08763c3a0fed2069e29db4c6bb0f476e78792cf9fdedfac32456"; + sha256 = "b965d61600c1abf44428478f4eb92f7e3e2dd276e79402be0bd4023feba935b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/lij/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lij/firefox-110.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "96269f1e5ba3753fb49794ec4823283491b4abdb0626a6580b5b3f1efab2c069"; + sha256 = "bdefa9af4a13b676bf7c818ac4efcb9a5f2a2d12705d7ba36571792be0695f20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/lt/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lt/firefox-110.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "71a277cc9fd8a61ba3dddad764b0c6a7fda5dfb6bf2177f8cc75ee3ffacd9786"; + sha256 = "c73514da05816640f9ce48e778814d257a3004e12970f57354454daa89966a73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/lv/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lv/firefox-110.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "86bf2b8b65f515bf58790f2bc30a632cf8a4751f264ec0259b869dc0813dc4ec"; + sha256 = "e7d75dc5dcd6e546e180f8652faae7f4a9185ce08988734385baecd405434751"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/mk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/mk/firefox-110.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "2caee54fdddb3f4874d808ee7610d64dce438deeec4f030e1675bd1133e8acd8"; + sha256 = "ce0be71233cb425fe048733efa8752a97b735f87eacc9745d6876dabb2fb86bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/mr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/mr/firefox-110.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "253d3ff0c4e244a10346eda07d63adc380cbea72fa052a17dbfa8af61a517af9"; + sha256 = "827c6b9756972ba8d50650b561913942655a8526250729a73f2be1db2b8cce33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ms/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ms/firefox-110.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3936c9f4900488d31203057214c6c0121f65495686c099971cc6f3cf7a368735"; + sha256 = "c6bb360c3c75b120d1b60eb4e0b036fb4b740482279bbbd7901c27fba5c54d4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/my/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/my/firefox-110.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "04fe1a0361b7eda1b28fcfdf98a581f4a0e248a6db647bbf404589e398eac64a"; + sha256 = "7ca65e1306d0a81cedc065e65974b891dadc8b5a253239c68b92e8356e1e803e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/nb-NO/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nb-NO/firefox-110.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "41639bb0cbcbff85f2fec3318eefd8b0d643550a1adee4782d5a904372786732"; + sha256 = "168e9939831e146176542fb61d3e86b05a5cfc911143e6f639563f7f0f3e6be1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ne-NP/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ne-NP/firefox-110.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "a9f41809ee0526fdb322e1313ce7dfc23118f277c3db3a1e10bf27cd3c47b722"; + sha256 = "7618535a3942c7cdd9eebd7e07095e70ec8500aec641de7cbe1279cc6a65b5ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/nl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nl/firefox-110.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "09320d70bfa669efe7871cd494b233e2b9fff320077e1304558c3039890884ae"; + sha256 = "a8232e3ca17a2bc13bc16f44ccaca500005aa8a6ab26302d10af6c7d145a942d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/nn-NO/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nn-NO/firefox-110.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "737dccedbfbc9d2310a7e6870518a2f77e2b17d69da19a8929df3cd1b7f666b2"; + sha256 = "b0713aa09bf6329abaa77791777d4a128e20c3279d07665912fc528524e7479f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/oc/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/oc/firefox-110.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0ffa6b471aa356d9380ed5795f4e2b5e47a766d64679c985fe59ab913b14863d"; + sha256 = "830744f6015dafb560d4e9957467864d91f534c8a6646558bc6391f62f213949"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pa-IN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pa-IN/firefox-110.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c99a8c9ab9033455acb3eadca94cfc5c15efdc458172944802a39918c94f3651"; + sha256 = "655100186a68188c159a0927bba75d6534e932dd6ce613c91ca48649eea49aa6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pl/firefox-110.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6a9d49716621fb5a04182614265e6dc9c8b52618eaad4498a10b6188f35785b9"; + sha256 = "2ddcc433c1072c76f76601c259063b3e582a690f47ebf79d49186582e6aab3f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pt-BR/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pt-BR/firefox-110.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dfcf1c15fc3376da4bcb18d404e3330ad1d04a1307bdf8b5731b2bfbdaf11e1e"; + sha256 = "57bc3a85b39d738d54f9326e693c99f0125f8ffe1e380023b55d372afb4c7c80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pt-PT/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pt-PT/firefox-110.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ebbcfad6776276ad0459e41dfd15dc5ef4ce2d099ca8aa0d5c992c833224ea20"; + sha256 = "7c6169bebb351077bb7e290d4448eaa97d12c964eacb890d1ede10c2f5d76d8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/rm/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/rm/firefox-110.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0924391109336ee501cf1abf1a5c6b1776ade3ba61fba15f0b4e16fb1db996b3"; + sha256 = "0d870b54174229b3763dcae71b2b3198a426c230d3598cf619505e1ed35d6add"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ro/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ro/firefox-110.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ac1ba842e7f9cdf86f5d9b469b8621d683e7a5716f05871b761520a8bb3fdfee"; + sha256 = "5cf581dbf61a962c255fb52a1072de263c00da1be74771525649469d2a9fd3ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ru/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ru/firefox-110.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d298dfe0e446e438d900e2501a9efe70c55f843d9590bdb4f65e3486807bb7e4"; + sha256 = "852eacf7321fef6bf9ba241028a0026370dd9fbbb0be77e82bb8068a98677aed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sco/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sco/firefox-110.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "85c4ae41383c4686c3ccdb143e789414785189c24dd1aaf52ba0c8b69cc65862"; + sha256 = "0069ed75e547a028f6140678d93356ed2be04e896d502a74c45b4e66e1dfa509"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/si/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/si/firefox-110.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "f57401bb72a03b9e7676ed6839ba07eac65201a7c368122d3174bb17abd0052f"; + sha256 = "9efcd39e2194b5ad1ff94c17d948a293bbede4c8b5eb9dc3b22d79064a93c4d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sk/firefox-110.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "790ba626a5276bf13314ead2f8134809d254d2daa471cbb7139e79d2638f862c"; + sha256 = "81f963046d3400bcc95ada2c114e0a7a8d852b10a79297d51c42cd4144499ed1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sl/firefox-110.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c3fe71c0e08a4ec80384d32d04de91a6717f397d4a16ab357d2e160be39e62ef"; + sha256 = "8c18f9736f2c647286f4a594b769364e2f78fbbc60c3ea0d30bba25675f6bbf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/son/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/son/firefox-110.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c43f935f36a13d4405e84888849fa65a74db46170e7d70e8168513f0ed5a1293"; + sha256 = "dc563e36867cc4b66a644b21b76b39eca8208dbef75dda5591a2cf7fd1d3fd4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sq/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sq/firefox-110.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a32fdc9295de5af65212232afc12a5551353bbe883603bfcb3b7455b5d724bc4"; + sha256 = "7e6ecb27a4827dcbe8b69a9dd1333e18e059b93134fe09560ad36a7a3cd487cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sr/firefox-110.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7ac06bd3e9d87d765f741329dd6123d61905150a895b08391ea9a721b688416f"; + sha256 = "25506c620fc67d533d67508431e451fbc966c0f51d0d95fff019e726201d151a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sv-SE/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sv-SE/firefox-110.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f9b8c7b4498bb7878501a792a9e74a02426afa487df60bc69fe61b3e241c2e68"; + sha256 = "67a96f19b8abdd776f33e7a7ea6d38325b256930da884e57286df7978868ec0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/szl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/szl/firefox-110.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "7a0ee765684a3a4b5ca72852980e5aa17b502e0536a89f22bd7f8606e9baa42d"; + sha256 = "c1cae0cb88b9025fee9a23f1ea6a3654d9c0d81f37e34f6b693f0b79c55e03e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ta/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ta/firefox-110.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b8e5e6f76501cf0e6d25df0d567bac8a59da80ab2958f49e4183deaf5f500480"; + sha256 = "10affe60eae4746154f4659fe0e305f2588d0baafcd898e01bd2031237623060"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/te/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/te/firefox-110.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "af0b910c67ed734fa20d5a4259218352735cac6b8284d5b6a64ffa74d04b96b3"; + sha256 = "907f1beeb68fca20a2635e42cd2849f89a828e5033d64a8e6df9f9b99ab5d85b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/th/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/th/firefox-110.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "10df84e1903cf7fb703bc590cf27b670a4778562190914f7d0f4df3894bc6dd5"; + sha256 = "fc3f884d44c2df1c8e78ac21297f8e06dd8d9ae88e6346b318fb1bda8d432c23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/tl/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/tl/firefox-110.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "49fdfafee4020a914ab5edbe2b64b907b4195679a065f1c9bf53d4ac2ba10be1"; + sha256 = "ccec6a6f0e0571d0048a137d3a01f3183912740a58ad1d71903eee0b3839e4ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/tr/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/tr/firefox-110.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5a266bd815e3c8569d263951bd91b0ee0383ff2157289ee8df4eeaca938bccbd"; + sha256 = "faff586ab4b72727307a0f5d94ac2adefb8e854bf9519b158fc04b61cb03aa96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/trs/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/trs/firefox-110.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2eda65562b714f7700f6628c254fbcc526fc938f3d147eccdc2154e42f22dee7"; + sha256 = "1ee44718fbfa37b936f029174deaa809b52a79eebf721da789724cb1fc5d98f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/uk/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/uk/firefox-110.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8541334d7bcf99959d944eaa7263000f502b1ed2d0a1b52dff91481cf01c1460"; + sha256 = "420ec9e9cb8f76f17c35c7fd7ffdfbad9fcd6ee6a99d576c21dbafd729967a8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ur/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ur/firefox-110.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "dc0eb2f604c869b45c247f65f62b5f7c5982f5ec7e4a6f55b901d5ded0f92b03"; + sha256 = "cb9653c4a616f34cb2ae31d48f91d0e129354e0846aeaba200120f1314b13193"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/uz/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/uz/firefox-110.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8ee65711e182478c360e988b9d1cbb8636d737d961817f1bfb2f2dedd38a36e9"; + sha256 = "2197bf705b85a4767ccea51845bb2f79b0b8a3ba6458fa49c8d70673cb9ddfe6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/vi/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/vi/firefox-110.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "32b9654813638160541512f03befb998416ad142a0f12d50bc02d75b646d88d7"; + sha256 = "afde552ce97783f075d400ca7703d80f6182ffe96c18ec239bc28917ddf6fb59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/xh/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/xh/firefox-110.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5317f9ada8234ff2bb305c8536d7aeb6b38f6047e8ef7907f1e01d60773e084b"; + sha256 = "42dc4fbb837bcf1d206628f8a38f78814aa9b8db992389f98b4dee7cb9e39fb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/zh-CN/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/zh-CN/firefox-110.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "20768d5d4943847fcbe4c8e549af0d03383c4ad20909b60421afba97fd3b5446"; + sha256 = "506437149ec7a6ca45b645b8635cedad6c6f540731ff3cba1de8cde944e507c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/zh-TW/firefox-110.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/zh-TW/firefox-110.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ed538524665e72125b820c4eefb5fed8983f84f42d7be65bea7c3915d9779002"; + sha256 = "ef860460d4322058a70741f32c5b5935ede0e2aee84299d165210ae987e27824"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 0a0eb47b0a..b91e5b05b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.14.2"; + version = "1.15.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-9onjQ7fRLlL5/1vMtNHjBBcB7Fyk1ERaHg5IwtwbJQg="; + hash = "sha256-NUgDaBRcgYGLKJhSJLT17VZj/mU0w6ySahIYnud5M6Y="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index fe510c7fb9..0a60dc7207 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "109.0-1", + "packageVersion": "109.0.1-2", "source": { - "rev": "109.0-1", - "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs" + "rev": "109.0.1-2", + "sha256": "1b5572i7aqad0pmjw88d3mhmhhhacp505z0d9l4l89r7gadssbwb" }, "firefox": { - "version": "109.0", - "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7" + "version": "109.0.1", + "sha512": "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 2101306e42..05e40ae790 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -40,7 +40,7 @@ assert stdenv.cc.isGNU; assert with lib.strings; ( versionAtLeast stdenv.cc.version "7.1" - && versionOlder stdenv.cc.version "12" + && versionOlder stdenv.cc.version "13" ); stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index 5441c7a58c..5a0e81f4a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,14 +1,17 @@ { mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: +let + srcInfo = builtins.fromJSON (builtins.readFile ./pin.json); +in mkYarnPackage rec { pname = "vieb"; - version = "9.5.0"; + inherit (srcInfo) version; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-SWHjzrEvRlTn4HJnT81Le4KsFDypN3QH3F/z7zZ8p3E="; + inherit (srcInfo) sha256; }; packageJSON = ./package.json; @@ -52,11 +55,13 @@ mkYarnPackage rec { distPhase = ":"; # disable useless $out/tarballs directory + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://vieb.dev/"; changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner fortuneteller2k ]; + maintainers = with maintainers; [ gebner fortuneteller2k tejing ]; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json index d9ce8e3026..28704db5c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "9.5.0", + "version": "9.5.1", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -25,9 +25,9 @@ "funding": "https://github.com/sponsors/Jelmerro/", "license": "GPL-3.0-or-later", "devDependencies": { - "electron": "22.0.0", - "electron-builder": "24.0.0-alpha.7", - "eslint": "8.29.0", + "electron": "22.0.3", + "electron-builder": "24.0.0-alpha.10", + "eslint": "8.32.0", "eslint-plugin-sort-keys": "2.3.5", "jest": "29.3.1", "jest-environment-jsdom": "29.3.1", @@ -37,13 +37,13 @@ "webpack-node-externals": "3.0.0" }, "dependencies": { - "@cliqz/adblocker-electron": "1.25.1", - "@cliqz/adblocker-electron-preload": "1.25.1", + "@cliqz/adblocker-electron": "1.25.2", + "@cliqz/adblocker-electron-preload": "1.25.2", "@mozilla/readability": "0.4.2", "darkreader": "4.9.58", "highlight.js": "11.7.0", - "jsdom": "20.0.3", - "marked": "4.2.4", + "jsdom": "21.0.0", + "marked": "4.2.12", "picomatch": "2.3.1" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/pin.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/pin.json new file mode 100644 index 0000000000..5efefe8405 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/pin.json @@ -0,0 +1,4 @@ +{ + "version": "9.5.1", + "sha256": "dUHjhJt0MarRNmDxs989aBTprjt+DUoYd3U05ELc0Tw=" +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/update.sh b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/update.sh new file mode 100755 index 0000000000..3efc252358 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash wget jq yarn yarn2nix nix-prefetch-github + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +if [ "$#" -gt 1 ] || [[ "${1:-}" == -* ]]; then + echo "Regenerates packaging data for the vieb package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="${1:-}" + +if [ -z "$version" ]; then + version="$(wget -O- "https://api.github.com/repos/Jelmerro/Vieb/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +SRC="https://raw.githubusercontent.com/Jelmerro/Vieb/$version" + +tmpdir="$(mktemp -d --tmpdir update-vieb-XXXXXX)" +pushd "$tmpdir" + +wget "$SRC/package-lock.json" +wget "$SRC/package.json" +yarn import +yarn2nix >yarn.nix + +popd +cp -ft . "$tmpdir/"{package.json,yarn.lock,yarn.nix} +rm -rf "$tmpdir" + +src_hash=$(nix-prefetch-github Jelmerro Vieb --rev "${version}" | jq -r .sha256) + +cat > pin.json << EOF +{ + "version": "$version", + "sha256": "$src_hash" +} +EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock index 135587f6b4..d238d1428b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -23,29 +23,29 @@ "@babel/highlight" "^7.18.6" "@babel/compat-data@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" - integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== + version "7.20.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" + integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== "@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" - integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" "@babel/generator" "^7.20.7" "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.11" "@babel/helpers" "^7.20.7" "@babel/parser" "^7.20.7" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" + "@babel/traverse" "^7.20.12" "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" "@babel/generator@^7.20.7", "@babel/generator@^7.7.2": @@ -95,10 +95,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" - integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== +"@babel/helper-module-transforms@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" @@ -106,7 +106,7 @@ "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" + "@babel/traverse" "^7.20.10" "@babel/types" "^7.20.7" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": @@ -273,10 +273,10 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz#114f992fa989a390896ea72db5220780edab509c" - integrity sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A== +"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" + integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== dependencies: "@babel/code-frame" "^7.18.6" "@babel/generator" "^7.20.7" @@ -303,45 +303,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz#da81e7838e288a6f0fdb8a97a0df8169accb74a1" - integrity sha512-7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA== +"@cliqz/adblocker-content@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz#8835d7307c7829e85a2e38e7e3bfd161024ae4d7" + integrity sha512-Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.25.1" + "@cliqz/adblocker-extended-selectors" "^1.25.2" -"@cliqz/adblocker-electron-preload@1.25.1", "@cliqz/adblocker-electron-preload@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz#83bd59d8e94436c451af3525d9902fa5fa1be3ab" - integrity sha512-edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ== +"@cliqz/adblocker-electron-preload@1.25.2", "@cliqz/adblocker-electron-preload@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz#67263683cce7cd036dbc0c37761c4f5eed6508ad" + integrity sha512-d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g== dependencies: - "@cliqz/adblocker-content" "^1.25.1" + "@cliqz/adblocker-content" "^1.25.2" -"@cliqz/adblocker-electron@1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz#44d9034e35c78938a772b10f8096df55a4accc41" - integrity sha512-CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw== +"@cliqz/adblocker-electron@1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz#1b0ec106cc395f5826d97fcfe8fbe4c333d39695" + integrity sha512-GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ== dependencies: - "@cliqz/adblocker" "^1.25.1" - "@cliqz/adblocker-electron-preload" "^1.25.1" + "@cliqz/adblocker" "^1.25.2" + "@cliqz/adblocker-electron-preload" "^1.25.2" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz#cfac0080952311399805fe153cd9e7e1331b3c6d" - integrity sha512-4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q== +"@cliqz/adblocker-extended-selectors@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz#77256c148b1f0a6792c1adad9e8b246cde65b37d" + integrity sha512-acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ== -"@cliqz/adblocker@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz#4d3e8894ce48ad0d0f8b26a4a1003f0676b7f734" - integrity sha512-1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg== +"@cliqz/adblocker@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz#f2bd7c48afa650f887ac59a9950bfb220ea8cc52" + integrity sha512-wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw== dependencies: - "@cliqz/adblocker-content" "^1.25.1" - "@cliqz/adblocker-extended-selectors" "^1.25.1" + "@cliqz/adblocker-content" "^1.25.2" + "@cliqz/adblocker-extended-selectors" "^1.25.2" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.197" + "@types/chrome" "^0.0.206" "@types/firefox-webext-browser" "^94.0.0" tldts-experimental "^5.6.21" @@ -359,9 +359,9 @@ integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@electron/asar@^3.2.1": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz#f6ae4eb4343ad00b994c40db3f09f71f968ff9c0" - integrity sha512-32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w== + version "3.2.3" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz#f598db50061ae5f90ad651f0255366b4e818000e" + integrity sha512-wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg== dependencies: chromium-pickle-js "^0.2.0" commander "^5.0.0" @@ -438,10 +438,10 @@ minimatch "^3.0.4" plist "^3.0.4" -"@eslint/eslintrc@^1.3.3": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" - integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== +"@eslint/eslintrc@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" + integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -458,7 +458,7 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@humanwhocodes/config-array@^0.11.6": +"@humanwhocodes/config-array@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== @@ -871,12 +871,12 @@ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@types/babel__core@^7.1.14": - version "7.1.20" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359" - integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" + integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" "@types/babel__generator" "*" "@types/babel__template" "*" "@types/babel__traverse" "*" @@ -913,10 +913,10 @@ "@types/node" "*" "@types/responselike" "^1.0.0" -"@types/chrome@^0.0.197": - version "0.0.197" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz#c1b50cdb72ee40f9bc1411506031a9f8a925ab35" - integrity sha512-m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA== +"@types/chrome@^0.0.206": + version "0.0.206" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz#ad1fd9799f368b5993d7c240492d4adaf5efbd8c" + integrity sha512-fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -944,12 +944,7 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/estree@^0.0.51": +"@types/estree@*", "@types/estree@^0.0.51": version "0.0.51" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== @@ -987,9 +982,9 @@ "@types/node" "*" "@types/graceful-fs@^4.1.3": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" - integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== dependencies: "@types/node" "*" @@ -1053,15 +1048,10 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*": - version "18.11.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" - integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== - -"@types/node@^16.11.26": - version "16.18.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz#d7415ef18c94f8d4e4a82ebcc8b8999f965d8920" - integrity sha512-XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w== +"@types/node@*", "@types/node@^16.11.26": + version "16.18.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz#cbb15c12ca7c16c85a72b6bdc4d4b01151bb3cae" + integrity sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA== "@types/plist@^3.0.1": version "3.0.2" @@ -1104,9 +1094,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.16", "@types/yargs@^17.0.8": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7" - integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g== + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz#107f0fcc13bd4a524e352b41c49fe88aab5c54d5" + integrity sha512-eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A== dependencies: "@types/yargs-parser" "*" @@ -1384,10 +1374,10 @@ app-builder-bin@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@24.0.0-alpha.7: - version "24.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz#fe798994f89cfa7f8e6ebfce8e73a816ba32ae16" - integrity sha512-kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA== +app-builder-lib@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz#244803adf93a6279dab09bc8d278c06ebc4f91b4" + integrity sha512-gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -1398,12 +1388,12 @@ app-builder-lib@24.0.0-alpha.7: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.8" - electron-publish "24.0.0-alpha.6" + electron-publish "24.0.0-alpha.8" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -1631,25 +1621,25 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.1.2-alpha.1: - version "9.1.2-alpha.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz#378bf1194325a9b362ccd2c32c8af46ee95f7c94" - integrity sha512-4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA== +builder-util-runtime@9.2.0-alpha.2: + version "9.2.0-alpha.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz#771a2787b247a15297377de23a916e9fc91050e6" + integrity sha512-MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@24.0.0-alpha.6: - version "24.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz#777977507a6f83eb55d2ffbc560f597b5b47269b" - integrity sha512-vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA== +builder-util@24.0.0-alpha.8: + version "24.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz#501de9052228ca8f87d43b53c01009dd069ad466" + integrity sha512-18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg== 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.2-alpha.1" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" @@ -1720,9 +1710,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001400: - version "1.0.30001441" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" - integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== + version "1.0.30001446" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz#6d4ba828ab19f49f9bcd14a8430d30feebf1e0c5" + integrity sha512-fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw== chalk@^2.0.0: version "2.4.2" @@ -1762,9 +1752,9 @@ chromium-pickle-js@^0.2.0: integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef" - integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog== + version "3.7.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" + integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== cjs-module-lexer@^1.0.0: version "1.2.2" @@ -1888,9 +1878,9 @@ commander@^5.0.0: integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== commander@^9.4.1: - version "9.4.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" - integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== compare-version@^0.1.2: version "0.1.2" @@ -2074,14 +2064,14 @@ dir-compare@^3.0.0: buffer-equal "^1.0.0" minimatch "^3.0.4" -dmg-builder@24.0.0-alpha.7: - version "24.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz#03f701547e7e5bf09c2cee3546a87685844efe70" - integrity sha512-5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw== +dmg-builder@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz#74b3e03c220486ad8a04ad9b8aac6ca6074ceef3" + integrity sha512-kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg== dependencies: - app-builder-lib "24.0.0-alpha.7" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + app-builder-lib "24.0.0-alpha.10" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -2133,17 +2123,17 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder@24.0.0-alpha.7: - version "24.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz#1c897b334d3fdaac57365a81cdb899fcca7aa697" - integrity sha512-havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ== +electron-builder@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz#1713da06493bffd02e76a6809b1e7147e0a4339c" + integrity sha512-10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA== dependencies: "@types/yargs" "^17.0.16" - app-builder-lib "24.0.0-alpha.7" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + app-builder-lib "24.0.0-alpha.10" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" - dmg-builder "24.0.0-alpha.7" + dmg-builder "24.0.0-alpha.10" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -2151,14 +2141,14 @@ electron-builder@24.0.0-alpha.7: simple-update-notifier "^1.1.0" yargs "^17.6.2" -electron-publish@24.0.0-alpha.6: - version "24.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz#df6edd7b95eec038b4f287968b9c9af6aaa74cd6" - integrity sha512-ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ== +electron-publish@24.0.0-alpha.8: + version "24.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz#d2326a33938ddc73bab83f149dbd9bab67b85804" + integrity sha512-DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" fs-extra "^10.1.0" lazy-val "^1.0.5" @@ -2169,10 +2159,10 @@ electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -electron@22.0.0: - version "22.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058" - integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg== +electron@22.0.3: + version "22.0.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz#44806cd053ea2ed35bffefd92143d3fc69d7337d" + integrity sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^16.11.26" @@ -2319,13 +2309,13 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@8.29.0: - version "8.29.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87" - integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg== +eslint@8.32.0: + version "8.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861" + integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ== dependencies: - "@eslint/eslintrc" "^1.3.3" - "@humanwhocodes/config-array" "^0.11.6" + "@eslint/eslintrc" "^1.4.1" + "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -2344,7 +2334,7 @@ eslint@8.29.0: file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.15.0" + globals "^13.19.0" grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" @@ -2480,9 +2470,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce" - integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -2634,9 +2624,9 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -2684,9 +2674,9 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: path-is-absolute "^1.0.0" glob@^8.0.1: - version "8.0.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2711,7 +2701,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0, globals@^13.19.0: +globals@^13.19.0: version "13.19.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== @@ -3471,9 +3461,9 @@ jest@29.3.1: jest-cli "^29.3.1" js-sdsl@^4.1.4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" - integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" + integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== js-tokens@^4.0.0: version "4.0.0" @@ -3495,7 +3485,39 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsdom@20.0.3, jsdom@^20.0.0: +jsdom@21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" + integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== + dependencies: + abab "^2.0.6" + acorn "^8.8.1" + acorn-globals "^7.0.0" + cssom "^0.5.0" + cssstyle "^2.3.0" + data-urls "^3.0.2" + decimal.js "^10.4.2" + domexception "^4.0.0" + escodegen "^2.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.2" + parse5 "^7.1.1" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.11.0" + xml-name-validator "^4.0.0" + +jsdom@^20.0.0: version "20.0.3" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== @@ -3557,10 +3579,10 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^2.2.0, json5@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" - integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== +json5@^2.2.0, json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^4.0.0: version "4.0.0" @@ -3732,10 +3754,10 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -marked@4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz#5a4ce6c7a1ae0c952601fce46376ee4cf1797e1c" - integrity sha512-Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA== +marked@4.2.12: + version "4.2.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" + integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== matcher@^3.0.0: version "3.0.0" @@ -3797,9 +3819,9 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: brace-expansion "^1.1.7" minimatch@^5.0.1, minimatch@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" - integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== + 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" @@ -3874,16 +3896,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@2.1.2: +ms@2.1.2, ms@^2.0.0: 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== - natural-compare@1.4.0, natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -3900,9 +3917,9 @@ neo-async@^2.6.2: integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== node-abi@^3.0.0: - version "3.30.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz#d84687ad5d24ca81cdfa912a36f2c5c19b137359" - integrity sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw== + 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== dependencies: semver "^7.3.5" @@ -3924,9 +3941,9 @@ node-api-version@^0.1.4: semver "^7.3.5" node-gyp-build@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" - integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== node-gyp@^9.0.0: version "9.3.1" @@ -4234,9 +4251,9 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== querystringify@^2.1.1: version "2.2.0" @@ -4331,9 +4348,9 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" + integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== resolve@^1.20.0: version "1.22.1" @@ -4463,9 +4480,9 @@ serialize-error@^7.0.1: type-fest "^0.13.1" serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== dependencies: randombytes "^2.1.0" @@ -4740,17 +4757,17 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -tldts-core@^5.7.103: - version "5.7.103" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz#462fd4b60704ddca9b71bd17c2c59504e6985ca5" - integrity sha512-MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg== +tldts-core@^5.7.104: + version "5.7.104" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz#4313a9663e4085332750a5fb04bfa0b0d91b826d" + integrity sha512-8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ== tldts-experimental@^5.6.21: - version "5.7.103" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz#a0b15a05c2cec7f0d4935de18dc9ad3fcbe0276f" - integrity sha512-oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ== + version "5.7.104" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz#f23e526240f674039857b653361f5da549dae758" + integrity sha512-GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA== dependencies: - tldts-core "^5.7.103" + tldts-core "^5.7.104" tmp-promise@^3.0.2: version "3.0.3" @@ -5094,9 +5111,9 @@ write-file-atomic@^4.0.1: signal-exit "^3.0.7" ws@^8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== xml-name-validator@^4.0.0: version "4.0.0" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix index 413a387f14..eaf66d689d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -26,19 +26,19 @@ }; } { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; + name = "_babel_compat_data___compat_data_7.20.10.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz"; - sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; + name = "_babel_compat_data___compat_data_7.20.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz"; + sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; }; } { - name = "_babel_core___core_7.20.7.tgz"; + name = "_babel_core___core_7.20.12.tgz"; path = fetchurl { - name = "_babel_core___core_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; - sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; + name = "_babel_core___core_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; - sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; + sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; }; } { @@ -290,11 +290,11 @@ }; } { - name = "_babel_traverse___traverse_7.20.7.tgz"; + name = "_babel_traverse___traverse_7.20.12.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz"; - sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; + name = "_babel_traverse___traverse_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; } { @@ -314,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz"; - sha512 = "7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA=="; + name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz"; + sha512 = "Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz"; - sha512 = "edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ=="; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz"; + sha512 = "d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g=="; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz"; - sha512 = "CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw=="; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz"; + sha512 = "GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ=="; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz"; - sha512 = "4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q=="; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz"; + sha512 = "acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ=="; }; } { - name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; + name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz"; - sha512 = "1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg=="; + name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz"; + sha512 = "wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw=="; }; } { @@ -370,11 +370,11 @@ }; } { - name = "_electron_asar___asar_3.2.2.tgz"; + name = "_electron_asar___asar_3.2.3.tgz"; path = fetchurl { - name = "_electron_asar___asar_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz"; - sha512 = "32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w=="; + name = "_electron_asar___asar_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz"; + sha512 = "wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg=="; }; } { @@ -418,11 +418,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; - sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; } { @@ -810,11 +810,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.20.tgz"; + name = "_types_babel__core___babel__core_7.20.0.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.20.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz"; - sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; + name = "_types_babel__core___babel__core_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz"; + sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ=="; }; } { @@ -850,11 +850,11 @@ }; } { - name = "_types_chrome___chrome_0.0.197.tgz"; + name = "_types_chrome___chrome_0.0.206.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.197.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz"; - sha512 = "m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA=="; + name = "_types_chrome___chrome_0.0.206.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz"; + sha512 = "fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg=="; }; } { @@ -881,14 +881,6 @@ sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; }; } - { - name = "_types_estree___estree_1.0.0.tgz"; - path = fetchurl { - name = "_types_estree___estree_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz"; - sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; - }; - } { name = "_types_estree___estree_0.0.51.tgz"; path = fetchurl { @@ -938,11 +930,11 @@ }; } { - name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; + name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; path = fetchurl { - name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; - sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; + name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw=="; }; } { @@ -1026,19 +1018,11 @@ }; } { - name = "_types_node___node_18.11.17.tgz"; + name = "_types_node___node_16.18.11.tgz"; path = fetchurl { - name = "_types_node___node_18.11.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; - sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; - }; - } - { - name = "_types_node___node_16.18.10.tgz"; - path = fetchurl { - name = "_types_node___node_16.18.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz"; - sha512 = "XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="; + name = "_types_node___node_16.18.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz"; + sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; } { @@ -1098,11 +1082,11 @@ }; } { - name = "_types_yargs___yargs_17.0.17.tgz"; + name = "_types_yargs___yargs_17.0.20.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.17.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz"; - sha512 = "72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g=="; + name = "_types_yargs___yargs_17.0.20.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz"; + sha512 = "eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A=="; }; } { @@ -1426,11 +1410,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz"; - sha512 = "kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA=="; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz"; + sha512 = "gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg=="; }; } { @@ -1674,19 +1658,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz"; - sha512 = "4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA=="; + name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz"; + sha512 = "MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ=="; }; } { - name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; + name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; path = fetchurl { - name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz"; - sha512 = "vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA=="; + name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz"; + sha512 = "18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg=="; }; } { @@ -1738,11 +1722,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; - sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; + name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz"; + sha512 = "fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw=="; }; } { @@ -1794,11 +1778,11 @@ }; } { - name = "ci_info___ci_info_3.7.0.tgz"; + name = "ci_info___ci_info_3.7.1.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz"; - sha512 = "2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog=="; + 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=="; }; } { @@ -1962,11 +1946,11 @@ }; } { - name = "commander___commander_9.4.1.tgz"; + name = "commander___commander_9.5.0.tgz"; path = fetchurl { - name = "commander___commander_9.4.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz"; - sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; + name = "commander___commander_9.5.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; }; } { @@ -2218,11 +2202,11 @@ }; } { - name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; + name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz"; - sha512 = "5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw=="; + name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz"; + sha512 = "kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg=="; }; } { @@ -2274,19 +2258,19 @@ }; } { - name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; + name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz"; - sha512 = "havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ=="; + name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz"; + sha512 = "10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA=="; }; } { - name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; + name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz"; - sha512 = "ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ=="; + name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz"; + sha512 = "DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ=="; }; } { @@ -2298,11 +2282,11 @@ }; } { - name = "electron___electron_22.0.0.tgz"; + name = "electron___electron_22.0.3.tgz"; path = fetchurl { - name = "electron___electron_22.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz"; - sha512 = "cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg=="; + name = "electron___electron_22.0.3.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz"; + sha512 = "eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g=="; }; } { @@ -2490,11 +2474,11 @@ }; } { - name = "eslint___eslint_8.29.0.tgz"; + name = "eslint___eslint_8.32.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.29.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz"; - sha512 = "isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg=="; + name = "eslint___eslint_8.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz"; + sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; } { @@ -2634,11 +2618,11 @@ }; } { - name = "fastq___fastq_1.14.0.tgz"; + name = "fastq___fastq_1.15.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz"; - sha512 = "eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg=="; + name = "fastq___fastq_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; } { @@ -2802,11 +2786,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + 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=="; }; } { @@ -2858,11 +2842,11 @@ }; } { - name = "glob___glob_8.0.3.tgz"; + name = "glob___glob_8.1.0.tgz"; path = fetchurl { - name = "glob___glob_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz"; - sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; + name = "glob___glob_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; } { @@ -3578,11 +3562,11 @@ }; } { - name = "js_sdsl___js_sdsl_4.2.0.tgz"; + name = "js_sdsl___js_sdsl_4.3.0.tgz"; path = fetchurl { - name = "js_sdsl___js_sdsl_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz"; - sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; + name = "js_sdsl___js_sdsl_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; } { @@ -3609,6 +3593,14 @@ sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } + { + name = "jsdom___jsdom_21.0.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz"; + sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; + }; + } { name = "jsdom___jsdom_20.0.3.tgz"; path = fetchurl { @@ -3666,11 +3658,11 @@ }; } { - name = "json5___json5_2.2.2.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -3866,11 +3858,11 @@ }; } { - name = "marked___marked_4.2.4.tgz"; + name = "marked___marked_4.2.12.tgz"; path = fetchurl { - name = "marked___marked_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz"; - sha512 = "Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA=="; + name = "marked___marked_4.2.12.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz"; + sha512 = "yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="; }; } { @@ -3954,11 +3946,11 @@ }; } { - name = "minimatch___minimatch_5.1.2.tgz"; + name = "minimatch___minimatch_5.1.6.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + name = "minimatch___minimatch_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; } { @@ -4049,14 +4041,6 @@ sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } - { - 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 = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { @@ -4082,11 +4066,11 @@ }; } { - name = "node_abi___node_abi_3.30.0.tgz"; + name = "node_abi___node_abi_3.31.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.30.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz"; - sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw=="; + 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=="; }; } { @@ -4114,11 +4098,11 @@ }; } { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; path = fetchurl { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; } { @@ -4474,11 +4458,11 @@ }; } { - name = "punycode___punycode_2.1.1.tgz"; + name = "punycode___punycode_2.3.0.tgz"; path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + name = "punycode___punycode_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; } { @@ -4602,11 +4586,11 @@ }; } { - name = "resolve.exports___resolve.exports_1.1.0.tgz"; + name = "resolve.exports___resolve.exports_1.1.1.tgz"; path = fetchurl { - name = "resolve.exports___resolve.exports_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz"; - sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; + name = "resolve.exports___resolve.exports_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz"; + sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="; }; } { @@ -4762,11 +4746,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + name = "serialize_javascript___serialize_javascript_6.0.1.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + name = "serialize_javascript___serialize_javascript_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; + sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; } { @@ -5090,19 +5074,19 @@ }; } { - name = "tldts_core___tldts_core_5.7.103.tgz"; + name = "tldts_core___tldts_core_5.7.104.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.103.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz"; - sha512 = "MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg=="; + name = "tldts_core___tldts_core_5.7.104.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz"; + sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; }; } { - name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz"; - sha512 = "oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ=="; + name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz"; + sha512 = "GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA=="; }; } { @@ -5482,11 +5466,11 @@ }; } { - name = "ws___ws_8.11.0.tgz"; + name = "ws___ws_8.12.0.tgz"; path = fetchurl { - name = "ws___ws_8.11.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz"; - sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; + name = "ws___ws_8.12.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz"; + sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; }; } { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index b028512dd7..2ded360481 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.9"; + version = "2.5.10"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI="; + sha256 = "sha256-5UzDfOPuDM5ADsXFwWa9aDM32I5s/TKg4r7idH/X3AQ="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; + vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 34bbcd0a1d..5b0c5c57cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.59"; + version = "0.8.62"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-uvvxlU5c5MNYVqu0btL4xpjyvb/fDbFPGWkIzru84Z8="; + sha256 = "sha256-lnMinIZ1n94ks7H5tlYmgaDDHyGi5YxTM9dTrckQ9y0="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index 2fbbc9ad1d..a1335641e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.45"; + version = "1.0.48"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; + sha256 = "sha256-KoW+XKEFoe2QNJPu97MYYZnxbU0Wat8slJjQm/vtmew="; }; - vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; + vendorHash = "sha256-QzTu6/iFK+CS8UXoXSVq3OTuwk/xcHnAX4UpCU/Scpk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix index ed4e2b0583..2c55802c72 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix @@ -10,15 +10,15 @@ }: let - openShiftVersion = "4.11.18"; + openShiftVersion = "4.12.0"; okdVersion = "4.11.0-0.okd-2022-11-05-030711"; - podmanVersion = "4.2.0"; + podmanVersion = "4.3.1"; writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; in buildGoModule rec { - version = "2.12.0"; + version = "2.13.1"; pname = "crc"; - gitCommit = "ea98bb41e24ad81a319d0aa6c6e1286bc1334c1b"; + gitCommit = "b5b864fdd4ed047027f439db96c2658aa194d2bc"; modRoot = "cmd/crc"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index d05b34cd7d..381cd1d456 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck; + inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck; pname = "docker-machine-hyperkit"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 9ef43bed2e..a35cfab16c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck; + inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck; pname = "docker-machine-kvm2"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 4aeb491410..01f229ca24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.38.3"; - sha256 = "15sx743gbmlmww7jmi56r5nlajg33xmzacyd69hmp46jjxqdckmh"; - manifestsSha256 = "1dmp7gdnwbg4jjc3dq1wp2jn3z3g6lm296b1nf24ndcfmjja58cz"; + version = "0.39.0"; + sha256 = "1mxzafv4p6n2r62nsr4py74z8jw42hm6ypm9kkfw3bfz5db7xhav"; + manifestsSha256 = "0wri6xzd603ll7ncn4af4xv5px1yg91m133m0dlrrzrb3izgiky0"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-IuOivH9K7e5vNpK44NKegzIEVHS+ihkX89++4DJC+8Q="; + vendorSha256 = "sha256-IyWXCunOCVDV/OHf3py/g0UbIByYhnIHDlEDxIkBLZI="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 5c47c602c3..2077549095 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; + hash = "sha256-mBmjGP7O1uX+uVM4/us4RWeJcXB1lSEvZQWT/3Ygzik="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 60f6c3ddb5..3537b2b951 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-Pes1p7rTO17Bef6qacsQWJkhb1CWilzmVYQe886EepU="; + sha256 = "sha256-TrjPpKFHMF+dPz9AqXVkYPUNWeWEeH8bA37Dpxr7b8s="; }; vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index ec4c1b8a04..fcbab9313e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-IYmNmrUdlp0V+gsAwivkF73VcBBMDcA5QWSnJ+6qKks="; + sha256 = "sha256-Qvpg6qLrtnnMrRWFHv7J+drM75V6DaMu1jxcxaCJ4kk="; }; - vendorSha256 = "sha256-yCdCuwiAAdyeLtu4zE7d8RLbqM6FuH9sw0EqDZohQxg="; + vendorHash = "sha256-wPkjRkgQiGvZm+eOGVlM5cgrYugF/E8H71bcR2ofP2U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/0001-script-download-strip-downloading-just-package-CRD.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 0000000000..115fd68247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/0001-script-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 3 Feb 2022 23:50:40 -0800 +Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD + +The CRD packaging is a complicated set of commands, so let's reuse it. +--- + scripts/download | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/scripts/download b/scripts/download +index 5effc0562a..82361803ee 100755 +--- a/scripts/download ++++ b/scripts/download +@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} + mkdir -p ${CHARTS_DIR} + mkdir -p ${DATA_DIR} + +-curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat +- +-git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} +- +-git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} +- + setup_tmp() { + TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) + cleanup() { +@@ -44,8 +38,8 @@ setup_tmp() { + + download_and_package_traefik () { + echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" +- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} +- code=$? ++ # nixpkgs: copy in our known traefik chart instead ++ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} + + if [ $code -ne 0 ]; then + echo "Error: Failed to download Traefik Helm chart!" +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix new file mode 100644 index 0000000000..1fbe7687a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -0,0 +1,331 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, k3s +, pkgsBuildBuild +}: + +with lib; + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.23.6+k3s1"; # k3s git tag + k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version + k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i"; + k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs="; + + # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 + # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. + traefikChartVersion = "10.19.3"; + traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058"; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "1.0.1-k3s1"; + k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92"; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + containerdVersion = "1.5.11-k3s2"; + containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2"; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion = "1.22.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl { + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = traefikChartSha256; + }; + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + patches = [ + ./0001-script-download-strip-downloading-just-package-CRD.patch + ]; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.23 + # passthru.updateScript = ./update.sh; + + # Fix-Me: Needs to be adapted specifically for 1.23 + # passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; }; + + meta = baseMeta; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/0001-script-download-strip-downloading-just-package-CRD.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 0000000000..115fd68247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/0001-script-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 3 Feb 2022 23:50:40 -0800 +Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD + +The CRD packaging is a complicated set of commands, so let's reuse it. +--- + scripts/download | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/scripts/download b/scripts/download +index 5effc0562a..82361803ee 100755 +--- a/scripts/download ++++ b/scripts/download +@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} + mkdir -p ${CHARTS_DIR} + mkdir -p ${DATA_DIR} + +-curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat +- +-git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} +- +-git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} +- + setup_tmp() { + TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) + cleanup() { +@@ -44,8 +38,8 @@ setup_tmp() { + + download_and_package_traefik () { + echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" +- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} +- code=$? ++ # nixpkgs: copy in our known traefik chart instead ++ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} + + if [ $code -ne 0 ]; then + echo "Error: Failed to download Traefik Helm chart!" +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix new file mode 100644 index 0000000000..18e0258432 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -0,0 +1,329 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, k3s +, pkgsBuildBuild +}: + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.24.4+k3s1"; # k3s git tag + k3sCommit = "c3f830e9b9ed8a4d9d0e2aa663b4591b923a296e"; # k3s git commit at the above version + k3sRepoSha256 = "00ns6n7jxnacah8ahndhgdb160prgsqhswbb5809kkgvig7k8b27"; + k3sVendorSha256 = "sha256-ReZvJCgxqffG2H39JlynGPUBSV5ngPkRtAoZ++OQZZI="; + + # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 + # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. + traefikChartVersion = "10.19.3"; + traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058"; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + containerdVersion = "1.5.13-k3s1"; + containerdSha256 = "09bj4ghwbsj9whkv1d5icqs52k64m449j8b73dmak2wz62fbzbvp"; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion = "1.24.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl { + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = traefikChartSha256; + }; + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + patches = [ + ./0001-script-download-strip-downloading-just-package-CRD.patch + ]; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.24 + # passthru.updateScript = ./update.sh; + + # Fix-Me: Needs to be adapted specifically for 1.24 + # passthru.tests = nixosTests.k3s; + + meta = baseMeta; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 0000000000..115fd68247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 3 Feb 2022 23:50:40 -0800 +Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD + +The CRD packaging is a complicated set of commands, so let's reuse it. +--- + scripts/download | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/scripts/download b/scripts/download +index 5effc0562a..82361803ee 100755 +--- a/scripts/download ++++ b/scripts/download +@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} + mkdir -p ${CHARTS_DIR} + mkdir -p ${DATA_DIR} + +-curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat +- +-git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} +- +-git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} +- + setup_tmp() { + TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) + cleanup() { +@@ -44,8 +38,8 @@ setup_tmp() { + + download_and_package_traefik () { + echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" +- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} +- code=$? ++ # nixpkgs: copy in our known traefik chart instead ++ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} + + if [ $code -ne 0 ]; then + echo "Error: Failed to download Traefik Helm chart!" +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix new file mode 100644 index 0000000000..dc34821fb2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -0,0 +1,329 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, pkgsBuildBuild +, k3s +}: + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.25.3+k3s1"; # k3s git tag + k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version + k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; + k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; + + # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 + # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. + traefikChartVersion = "12.0.0"; + traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a"; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + containerdVersion = "1.5.13-k3s2"; + containerdSha256 = "1pfr2ji4aij9js90gf4a3hqnhyw5hshcjdccm62l700j68gs5z97"; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion = "1.25.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl { + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = traefikChartSha256; + }; + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + patches = [ + ./0001-script-download-strip-downloading-just-package-CRD.patch + ]; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.25 + # passthru.updateScript = ./update.sh; + + # Fix-Me: Needs to be adapted specifically for 1.25 + # passthru.tests = nixosTests.k3s; + + meta = baseMeta; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/chart-versions.nix rename to third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/update.sh similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh rename to third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/update.sh diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 141a17e34e..8ac275c1b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.27.0"; + version = "0.27.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-optEMGB6izGlpcq2AJOY4lTt8igYBilE0Bg8KxE8AsU="; + sha256 = "sha256-9wdc3Wiqry8+q/60Y7mPzH0k4dp1nKIGinxfkYBaHJY="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorHash = "sha256-57JrBmund2hwcgqWkLos/h1EOgZQb9HfKUf1BX0MYGQ="; + vendorHash = "sha256-8H7siVl6gXifQOBOLtyCeDbYflhKjaIRmP0KOTWVJk0="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index 53da8b9be2..7af197a999 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws="; + sha256 = "sha256-i8uKhzvU9ftlzgzU4ViYg6z+OUNNHGbiFhFAwDKwtnw="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g="; + vendorHash = "sha256-BGIh1wzHIk1kSvk/sQ/tDBhGIOOx0o6Dk4LbK9Z1FAQ="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 4e31f689dd..365016eb67 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.1.1"; - sha256 = "159myaz0zh0j8vdknxshyvkl1khxbznvls2mk5wyssxqll8b3j32"; - vendorSha256 = "sha256-7+ppFmM+NVnMU6pg2FcaSGqcq429EmrPYgAZfHANtEg="; + version = "23.1.2"; + sha256 = "1c8l5zzy5pjilp1a84084g3dgdm0rxkx7hj7lqcn0iihfvhxc1xq"; + vendorSha256 = "sha256-6dOX3SsKjpwC/dEUO2SnVna99lpav7kIEKrMUy4YfhA="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix index f21ee96ecd..a4aec900a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -20,6 +20,11 @@ buildGoModule rec { env GOFLAGS="" go generate ./jaeger/static env GOFLAGS="" go generate ./multicluster/static env GOFLAGS="" go generate ./viz/static + + # Necessary for building Musl + if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then + export GOFLAGS="-buildmode=pie $GOFLAGS" + fi ''; tags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index ce363080f4..9d24694703 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew="; + hash = "sha256-DqBBetOyE8QALMEiYqA0rZEpPhBtde0STxiGrFqqFpY="; }; vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix new file mode 100644 index 0000000000..0ebb08337c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pv-migrate"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "utkuozdemir"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-I66J1/N8Ln7KBQfzg39wdZuM6PeJGn1HiNK2YVzDySw"; + }; + + subPackages = [ "cmd/pv-migrate" ]; + + vendorSha256 = "sha256-/klqOfM0ZhbzZWOLm0pA0/RB84kvfEzFJN1OQUVSNEA"; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + "-X main.commit=${src.rev}" + "-X main.date=1970-01-01-00:00:01" + ]; + + meta = with lib; { + description = "CLI tool to easily migrate Kubernetes persistent volumes "; + homepage = "https://github.com/utkuozdemir/pv-migrate"; + changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}"; + license = licenses.afl20; + maintainers = [ maintainers.ivankovnatsky ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 7459bba169..ee045f5782 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo="; + sha256 = "sha256-tqp2H8aWPBgje1zIK673cbr+DShhTQL9VQ0dEL/he7s="; }; - vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w="; + vendorHash = "sha256-ud07lWHwQfAHgVenUApwrfxmTjJKVm+pOExdR9pZFxA="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index 0b1077443a..6a2c39de11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "temporal"; - version = "1.17.5"; + version = "1.19.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-u8GyaXpiVZdPDoPAqIa+TY+JQFZeSGOLrUy+e3E4kig="; + hash = "sha256-j2+K/ZDDNakofrToxhyA1gh534l3Eq6G/fNXE0ktceY="; }; - vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; + vendorHash = "sha256-KkgyL37VJy1DhfCB5RJpjczBPbzQwt1xsovQ0xCXGr4="; + + excludedPackages = [ "./build" ]; CGO_ENABLED = 0; @@ -26,6 +28,7 @@ buildGoModule rec { install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool + install -Dm755 "$GOPATH/bin/tdbg" -T $out/bin/tdbg runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index c698212db5..8d922bd46d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,14 +1,12 @@ { "aci": { - "deleteVendor": true, - "hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=", + "hash": "sha256-rgPqf8PopvzXiIOjng7DNOv920MPI81EVMUu3DaS8o4=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", - "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.6.0", + "rev": "v2.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E=" + "vendorHash": null }, "acme": { "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", @@ -39,20 +37,20 @@ "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" }, "akamai": { - "hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=", + "hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.2.1", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" + "vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y=" }, "alicloud": { - "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", + "hash": "sha256-LFguUrrI/7gFiXwub2jTKTOI1ppLEx8M/Jka4ypgb3E=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.197.0", + "rev": "v1.198.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -93,14 +91,14 @@ "vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw=" }, "avi": { - "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.2", + "rev": "v22.1.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" + "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", @@ -112,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-jZYeMQW2DTGE/KyUJYGFPHGjFUGgfl11kE1jucZ5sH4=", + "hash": "sha256-CdG7StgMUr6FjC4YJKIfQlWqjvgnvzyGh8zKQ+DUJzU=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.52.0", + "rev": "v4.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/6RbqOh5/Fpn25woV/AzmkTs1qnIo+sl3fKQxCtVZHQ=" + "vendorHash": "sha256-rnOrA3QYLZAU+VCm6OVLrnJ37Vcp6xzq0N8ohjWDl3Q=" }, "azuread": { "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", @@ -130,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-eDlRnJUo561edblydjBGePJzMFRqtEqKnS+8HOhKGdA=", + "hash": "sha256-eZwQsvIXYwpx/uLJKmYnNaOFWBue1ADeyhVbvl3fAy0=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.41.0", + "rev": "v3.42.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -148,14 +146,13 @@ "vendorHash": null }, "baiducloud": { - "deleteVendor": true, "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", "rev": "v1.19.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" + "vendorHash": null }, "bigip": { "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", @@ -322,13 +319,13 @@ "vendorHash": null }, "dns": { - "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "hash": "sha256-qLKlnw0vnPvxJluvUiBERu1YdtrRklocVw314/lvQT4=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.2.3", + "rev": "v3.2.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" + "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", @@ -415,20 +412,20 @@ "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { - "hash": "sha256-mQ4L2XCudyPGDw21jihF7nkSct7/KWAe/txnbtuJ8Lk=", + "hash": "sha256-eVSMjXSYRedig93Tm2ZLpbuJhG3wKSBwfLli7OWs3dU=", "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.2", + "rev": "v2.2.3", "spdx": "MPL-2.0", "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-o/kJwByQDXgbazZPoYW4YeV7BK4Bb3pwQhnWMhW4klE=", + "hash": "sha256-QobAIpDDl5SXG9hmpdq8lDm8Sg5w2oK4A+e8WKw52Cc=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.16.0", + "rev": "v5.17.0", "spdx": "MIT", "vendorHash": null }, @@ -442,22 +439,22 @@ "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=", + "hash": "sha256-B/eXf31mRtWpl6TCv/hukPWfbb7Ne4W2FUMxiAbfsfI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.51.0", + "rev": "v4.52.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=", + "hash": "sha256-ISOhZqc6/RMqG4n63RjQluy0odkKATcCa52YpQW89xQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.51.0", + "rev": "v4.52.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, @@ -670,13 +667,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v1.29.4", + "rev": "v1.30.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" + "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -700,11 +697,10 @@ "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", - "proxyVendor": true, "repo": "terraform-provider-lxd", "rev": "v1.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" + "vendorHash": "sha256-CLr28g/uI9ZU4xIcA76v/BX6gJV91elvFIlYFoSxkfw=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", @@ -770,13 +766,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-lWjXsIeYpe07+kIHr8qS8SmChs0tnfzxWy/K1KNJ5oo=", + "hash": "sha256-OUcSegGIiXNKC5FCB9+4tnsNGiEIxBFX1UZLLwxsHwM=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.13.0", + "rev": "v3.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ptjd4A/P2pZL5wP8IGHN385jngfS56w7FN1g/EpknRw=" + "vendorHash": "sha256-AR62fegcN9+qTuKwGbb8cEem8nsjgRQkYm3R3VNzYKA=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -816,11 +812,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", + "hash": "sha256-mzAfqJcAZEFGmptjaXAtbmcrtVyufd2LLTe8TmFHtQc=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.105.0", + "rev": "v4.107.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -969,13 +965,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=", + "hash": "sha256-tLSTRoiqhi+CbdF8fmNLNMYN7FrDeoK/5XXyqCJnUKk=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.9.1", + "rev": "v2.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng=" + "vendorHash": "sha256-cT9W2fP56TPOIoxWBWF0VXDuSKXZsJNs/GPpBq/0zZs=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -987,13 +983,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", + "hash": "sha256-gZiDFcrQZsOE0R74LYwoitAjuPqPZCPLTEL3giom+c8=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v3.9.0", + "rev": "v3.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" + "vendorHash": "sha256-+Duf/wdjmw6NBhmy1KmNRJ+ZEjjwtJoXXQCw2lJzxS4=" }, "sentry": { "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", @@ -1032,11 +1028,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-cocHU3xdlSAyBeOI5yLEo3j/ErfPwFIkkWgF4JB43fY=", + "hash": "sha256-uO3LgEQjeHS8kbolFZ3jb6FltMAiWNTVsjCSrsI776M=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.56.2", + "rev": "v0.56.3", "spdx": "MIT", "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, @@ -1095,11 +1091,11 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-CLXW1takpsySUo8lpDe6DzRFczts1zRriHZge5uCb3A=", + "hash": "sha256-yVI1f86Gpkwl3jCAs5d54rZS8lM7cjbwWq+HUXwi8EU=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.6", + "rev": "v1.79.8", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1168,13 +1164,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-B2FdeukUD+xuJHBT1Yv9G2txjX/OmkxAGXDUw2HItig=", + "hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.6.0", + "rev": "1.7.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" + "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", @@ -1223,13 +1219,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "hash": "sha256-VScIcK4bInS9yhIYkYRsU8Hhzex9iyVkPiyjnnjshkI=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.2.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" + "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { "hash": "sha256-DfiJgN1R7qW3c13hBabsMizY3mYamIq8AGms1q9kdVU=", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index bfe3411571..b36cd477a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.43.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY="; + hash = "sha256-PojwY5sLfO8n1obyb9aHp0ym5RDD6SLLth4977gTc+U="; }; vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix index 8719ebebb7..c8f2fb070f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1300"; + version = "0.13.1308"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-btvoFllCfwQJNpRWdAB05Cu4JYmT1xynJxDbzO/6LDs="; + sha256 = "sha256-EyA7LwfL3vCNzd2wpyUbrUnvkM0/f7/cQp+jcAcGZsg="; }; - vendorSha256 = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; + vendorHash = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index bc4f1959ea..dcb4dd9eb0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-PBCTVws5N42q68rKcMLW7GgZvdsQgmdlsKMpJ5bCF00="; + sha256 = "sha256-jN45chUeoGJGJWD6Rj6duNE36/QCzPqci8V3h1OHtw4="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-5Po8TRCE6VP+RcaIJImYjElTMHHS/2JwbrHreeWLxio="; + vendorHash = "sha256-mvVwf4w/65L+F6aiTNf2jmJtaT1EpWCQJ6r9NHUUUqQ="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index ae56b05bd9..c93480694a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.198"; + version = "1.2.199"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-fJDcVqHVN+2KXoqFCTACDevFtOllEGDMcQO/oDb6GMI="; + hash = "sha256-oUdqaoIvYTpJXWzfmgCwDJza5mTQItHgf2p9/HBMc/g="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 7adcfc8a9a..3e66621b57 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.25.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XH9o1DTwG5ne5TZDgsS4HfC5WqLXc16JtjkKQtiE8z0="; + sha256 = "sha256-wkPBMFsPLJFfilKuA3bGNn7NtC+wsnXZf+qkVpF2fWc="; }; - vendorSha256 = "sha256-iVyLNPvmzkI46Cp0SgbxK6xIQspJjpYjqPf3mOMoZvU="; + vendorHash = "sha256-U7RQPrvByTADC2/8O0cvcf0nmDgIeVkuyRGV0fpSCPk="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index f1225f87ee..57cf5e20bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-hfUtxPGPhPC2VgGLLIaYHlEMpXHAPZ5fkLL0glhyQcY="; + sha256 = "sha256-2h9fVah0WZ8X0GsCLtiUWRan1Gkl4WBxuEQ3gx4FFBo="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 81062c1eb7..2367f847d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch new file mode 100644 index 0000000000..4784e6790f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch @@ -0,0 +1,16 @@ +diff --git a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt +index bafbabf1..0579f20a 100644 +--- a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt ++++ b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt +@@ -188,11 +188,3 @@ install_headers(include hilti) + install_headers(${PROJECT_BINARY_DIR}/include/hilti hilti) + install(CODE "file(REMOVE \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_INCLUDEDIR}/hilti/hilti\")" + )# Get rid of symlink. +- +-##### Tests +- +-add_executable(hilti-toolchain-tests tests/main.cc tests/id-base.cc tests/visitor.cc tests/util.cc) +-hilti_link_executable_in_tree(hilti-toolchain-tests PRIVATE) +-target_link_libraries(hilti-toolchain-tests PRIVATE doctest) +-target_compile_options(hilti-toolchain-tests PRIVATE "-Wall") +-add_test(NAME hilti-toolchain-tests COMMAND ${PROJECT_BINARY_DIR}/bin/hilti-toolchain-tests) diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch new file mode 100644 index 0000000000..07b95960ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch @@ -0,0 +1,75 @@ +From 889ee4dd9e778511e2fb850e6467f55a331cded9 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer +Date: Sun, 13 Nov 2022 19:06:00 +0100 +Subject: [PATCH] Fix include path in exported CMake targets + +--- + CMakeLists.txt | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e22b77aa..77a15314 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,7 +209,6 @@ if (CAF_ROOT) + else() + find_package(CAF REQUIRED COMPONENTS openssl test io core net) + endif() +- list(APPEND LINK_LIBS CAF::core CAF::io CAF::net) + set(BROKER_USE_EXTERNAL_CAF ON) + else () + message(STATUS "Using bundled CAF") +@@ -243,22 +242,18 @@ endif () + + # Make sure there are no old header versions on disk. + install( +- CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")" +- CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")") ++ CODE "MESSAGE(STATUS \"Removing: ${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")" ++ CODE "file(REMOVE_RECURSE \"${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")") + + # Install all headers except the files from broker/internal. + install(DIRECTORY include/broker +- DESTINATION include ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + FILES_MATCHING PATTERN "*.hh" + PATTERN "include/broker/internal" EXCLUDE) + +-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) +- +-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) +- + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.hh.in + ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION include/broker) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/broker") + + if (NOT BROKER_EXTERNAL_SQLITE_TARGET) + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) +@@ -360,6 +355,11 @@ if (ENABLE_SHARED) + OUTPUT_NAME broker) + target_link_libraries(broker PUBLIC ${LINK_LIBS}) + target_link_libraries(broker PRIVATE CAF::core CAF::io CAF::net) ++ target_include_directories( ++ broker PUBLIC ++ $ ++ $ ++ $) + install(TARGETS broker + EXPORT BrokerTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -373,6 +373,11 @@ if (ENABLE_STATIC) + endif() + target_link_libraries(broker_static PUBLIC ${LINK_LIBS}) + target_link_libraries(broker_static PRIVATE CAF::core CAF::io CAF::net) ++ target_include_directories( ++ broker_static PUBLIC ++ $ ++ $ ++ $) + install(TARGETS broker_static + EXPORT BrokerTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix new file mode 100644 index 0000000000..cb10e43933 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, callPackage +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, caf +, openssl +}: +let + inherit (stdenv.hostPlatform) isStatic; + + src-cmake = fetchFromGitHub { + owner = "zeek"; + repo = "cmake"; + rev = "0b7a543554622600bc0a42b57a22f291a4fbd86c"; + hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY="; + }; + src-3rdparty = fetchFromGitHub { + owner = "zeek"; + repo = "zeek-3rdparty"; + rev = "eb87829547270eab13c223e6de58b25bc9a0282e"; + hash = "sha256-AVaKcRjF5ZiSR8aPSLBzSTeWVwGWW/aSyQJcN0Yhza0="; + }; + caf' = caf.overrideAttrs (old: { + version = "unstable-2022-11-17-zeek"; + src = fetchFromGitHub { + owner = "zeek"; + repo = "actor-framework"; + rev = "dbb68b4573736d7aeb69268cc73aa766c998b3dd"; + hash = "sha256-RV2mKF3B47h/hDgK/D1UJN/ll2G5rcPkHaLVY1/C/Pg="; + }; + checkPhase = '' + runHook preCheck + libcaf_core/caf-core-test + libcaf_io/caf-io-test + libcaf_openssl/caf-openssl-test + libcaf_net/caf-net-test --not-suites='net.*' + runHook postCheck + ''; + }); +in +stdenv.mkDerivation rec { + pname = "zeek-broker"; + version = "2.4.2"; + outputs = [ "out" "py" ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "broker"; + rev = "v${version}"; + hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k="; + }; + postUnpack = '' + rmdir $sourceRoot/cmake $sourceRoot/3rdparty + ln -s ${src-cmake} ''${sourceRoot}/cmake + ln -s ${src-3rdparty} ''${sourceRoot}/3rdparty + + # Refuses to build the bindings unless this file is present, but never + # actually uses it. + touch $sourceRoot/bindings/python/3rdparty/pybind11/CMakeLists.txt + ''; + + patches = [ + ./0001-Fix-include-path-in-exported-CMake-targets.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl python3.pkgs.pybind11 ]; + propagatedBuildInputs = [ caf' ]; + + cmakeFlags = [ + "-DCAF_ROOT=${caf'}" + "-DENABLE_STATIC_ONLY:BOOL=${if isStatic then "ON" else "OFF"}" + "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" + ]; + + meta = with lib; { + description = "Zeek's Messaging Library"; + homepage = "https://github.com/zeek/broker"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch new file mode 100644 index 0000000000..18aef60132 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch @@ -0,0 +1,26 @@ +diff --git a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt +index f154901c..76563717 100644 +--- a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt ++++ b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt +@@ -69,7 +69,7 @@ target_compile_definitions(hilti-rt-objects PRIVATE "HILTI_RT_BUILD_TYPE_RELEASE + # Build hilti-rt-debug with debug flags. + string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) + target_compile_options(hilti-rt-debug-objects PRIVATE ${cxx_flags_debug}) +-target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") ++target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") + target_compile_definitions(hilti-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") + + add_library(hilti-rt-tests-library-dummy1 SHARED src/tests/library-dummy.cc) +diff --git a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt +index 20e7d291..9712341f 100644 +--- a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt ++++ b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt +@@ -48,7 +48,7 @@ target_link_libraries(spicy-rt-objects PUBLIC hilti-rt-objects) + # Build spicy-rt-debug with debug flags. + string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) + target_compile_options(spicy-rt-debug-objects PRIVATE ${cxx_flags_debug}) +-target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") ++target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") + target_compile_definitions(spicy-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") + target_link_libraries(spicy-rt-debug-objects PUBLIC hilti-rt-debug-objects) + diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index ddeb03698e..0bacf8ce03 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -1,10 +1,13 @@ { lib , stdenv +, callPackage , fetchurl , cmake , flex , bison +, spicy-parser-generator , openssl +, libkqueue , libpcap , zlib , file @@ -16,46 +19,69 @@ , gettext , coreutils , ncurses -, caf }: +let + broker = callPackage ./broker { }; +in stdenv.mkDerivation rec { pname = "zeek"; - version = "4.2.2"; + version = "5.1.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw="; + sha256 = "sha256-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU="; }; + strictDeps = true; + + patches = [ + ./avoid-broken-tests.patch + ./debug-runtime-undef-fortify-source.patch + ./fix-installation.patch + ]; + nativeBuildInputs = [ bison cmake file flex + python3 ]; buildInputs = [ + broker + spicy-parser-generator curl gperftools + libkqueue libmaxminddb libpcap ncurses openssl - python3 swig zlib ] ++ lib.optionals stdenv.isDarwin [ gettext ]; - outputs = [ "out" "lib" "py" ]; + postPatch = '' + patchShebangs ./auxil/spicy/spicy/scripts + + substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" "" + substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" "" + ''; cmakeFlags = [ - "-DCAF_ROOT=${caf}" - "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages" + "-DBroker_ROOT=${broker}" + "-DSPICY_ROOT_DIR=${spicy-parser-generator}" + "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" + "-DZEEK_ETC_INSTALL_DIR=/etc/zeek" + "-DZEEK_LOG_DIR=/var/log/zeek" + "-DZEEK_STATE_DIR=/var/lib/zeek" + "-DZEEK_SPOOL_DIR=/var/spool/zeek" ]; postInstall = '' @@ -70,6 +96,10 @@ stdenv.mkDerivation rec { done ''; + passthru = { + inherit broker; + }; + meta = with lib; { description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch new file mode 100644 index 0000000000..6360a11730 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch @@ -0,0 +1,28 @@ +From f8c42a712db42cfd00fca75be2ce63c3aad2aad1 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer +Date: Sun, 13 Nov 2022 21:48:36 +0100 +Subject: [PATCH] Fix installation + +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b65efd..d8b0be169 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,11 +81,6 @@ if ( NOT ZEEK_LOG_DIR ) + set(ZEEK_LOG_DIR ${ZEEK_ROOT_DIR}/logs) + endif () + +-install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR}) +- + configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) + execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + "${CMAKE_CURRENT_BINARY_DIR}/zeek-wrapper.in" +-- +2.37.3 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index 0c43ffbeea..47d6db1562 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -33,6 +33,8 @@ , systemd , xdg-utils , xorg +, wayland +, pipewire }: stdenv.mkDerivation rec { @@ -97,6 +99,8 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver xorg.libxshmfence xorg.libXtst + wayland + pipewire ]; sourceRoot = "."; @@ -114,9 +118,9 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - "''${gappsWrapperArgs[@]}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} # Fix desktop link substituteInPlace $out/share/applications/armcord.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index a6d7bf7276..fdfb992192 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.24"; ptb = "0.0.38"; - canary = "0.0.145"; + canary = "0.0.146"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU="; + sha256 = "sha256-5GiG+RGqwHUdIeSVWpbaIw3sTuZbvIQeetXSEvSqTls="; }; }; x86_64-darwin = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 362d7a096b..6e462ef24d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo -, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: +, pkg-config, libsecret, xcbuild, Security, AppKit, fetchNpmDeps, npmHooks }: let pinData = lib.importJSON ./pin.json; @@ -15,39 +15,26 @@ in stdenv.mkDerivation rec { sha256 = pinData.srcHash; }; - nativeBuildInputs = [ nodejs python3 yarn pkg-config ] + nativeBuildInputs = [ + nodejs python3 pkg-config + npmHooks.npmConfigHook + ] ++ lib.optional stdenv.isDarwin xcbuild; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; - npm_config_nodedir = nodejs; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - sha256 = pinData.yarnHash; + npmDeps = fetchNpmDeps { + inherit src; + hash = pinData.npmHash; }; - buildPhase = '' - runHook preBuild - cp ${./yarn.lock} ./yarn.lock - chmod u+w . ./yarn.lock - export HOME=$PWD/tmp - mkdir -p $HOME - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - node_modules/.bin/node-gyp rebuild - runHook postBuild - ''; - doCheck = false; installPhase = '' runHook preInstall shopt -s extglob rm -rf node_modules - rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json index fa2e95d4e1..dc7420ab45 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json @@ -1,5 +1,5 @@ { - "version": "7.7.0", - "srcHash": "sd6h+vDJGvmXFhOm4MDAljb4dAOMBB8W1IL7JSfJWyo=", - "yarnHash": "1m75hvl06mcj260hicbmv75p94h73gw5d24zpm5wxwc0q8v8wzfl" + "version": "7.9.0", + "srcHash": "Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", + "npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY=" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index d18cc7d0e8..0ddfa02472 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn +#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the keytar package." @@ -22,10 +22,8 @@ SRC="https://raw.githubusercontent.com/atom/node-keytar/v$version" wget "$SRC/package-lock.json" wget "$SRC/package.json" -rm -f yarn.lock -yarn import +npm_hash=$(prefetch-npm-deps package-lock.json) rm -rf node_modules package.json package-lock.json -yarn_hash=$(prefetch-yarn-deps yarn.lock) src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256) @@ -33,6 +31,6 @@ cat > pin.json << EOF { "version": "$version", "srcHash": "$src_hash", - "yarnHash": "$yarn_hash" + "npmHash": "$npm_hash" } EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock deleted file mode 100644 index 5a3abec6de..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock +++ /dev/null @@ -1,2531 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -abbrev@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" - integrity sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8= - -after@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - -ajv@^6.12.3: - version "6.12.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" - integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - -anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" - integrity sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw== - -are-we-there-yet@~1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c" - integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.0 || ^1.1.13" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -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== - -array-index@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" - integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= - dependencies: - debug "^2.2.0" - es6-symbol "^3.0.2" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" - integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0, babel-core@^6.26.3: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= - -babel-plugin-transform-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" - integrity sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.10.0" - -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.24.1: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e" - integrity sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4= - dependencies: - babel-runtime "^6.22.0" - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^1.0.1" - -babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -big-integer@^1.6.17: - version "1.6.48" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" - integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -binary@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - -bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bl@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== - dependencies: - readable-stream "^3.0.1" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - -bluebird@^3: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -bluebird@~3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI= - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== - -buffer-indexof-polyfill@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" - integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== - -buffer-shims@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" - integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= - -camelcase@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= - -camelcase@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chai@^4.2.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49" - integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^3.0.1" - get-func-name "^2.0.0" - pathval "^1.1.1" - type-detect "^4.0.5" - -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= - dependencies: - traverse ">=0.3.0 <0.4" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= - -chokidar@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cmake-js@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz#6d72014269a5d23a754a6d170cde9ed2d75eb411" - integrity sha512-/HLhzoBEOLKGdE1FLwH5ggzRt67AWTb4IErg4rm+bTC+R0DKUobojDyp17dSswDVPosdoPmHXjKxbJiyBZfQeg== - dependencies: - bluebird "^3" - debug "^4" - fs-extra "^5.0.0" - is-iojs "^1.0.1" - lodash "^4" - memory-stream "0" - npmlog "^1.2.0" - rc "^1.2.7" - request "^2.54.0" - semver "^5.0.3" - splitargs "0" - tar "^4" - traceur "0.0.x" - unzipper "^0.8.13" - url-join "0" - which "^1.0.9" - yargs "^3.6.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colors@~0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" - integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@2.9.x, commander@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= - dependencies: - graceful-readlink ">= 1.0.0" - -commander@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz#175ad4b9317f3ff615f201c1e57224f55a3e91df" - integrity sha1-F1rUuTF/P/YV8gHB5XIk9Vo+kd8= - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -console-control-strings@^1.0.0, 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 sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU= - -core-js@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" - integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4= - -core-js@^2.5.0: - version "2.5.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" - integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw== - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -d@1, d@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" - integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== - dependencies: - es5-ext "^0.10.50" - type "^1.0.1" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: - 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" - -debug@^4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - -decamelize@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== - dependencies: - type-detect "^4.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -duplexer2@~0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= - dependencies: - readable-stream "~1.1.9" - -duplexer2@~0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= - dependencies: - readable-stream "^2.0.2" - -each-series-async@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" - integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU= - dependencies: - jsbn "~0.1.0" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -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" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== - -es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" - -es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" - integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== - dependencies: - d "^1.0.1" - ext "^1.1.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= - -execspawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" - integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= - dependencies: - util-extend "^1.0.1" - -expand-template@^2.0.3: - version "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== - -ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== - dependencies: - type "^2.0.0" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extsprintf@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" - integrity sha1-4QgOBljjALBilJkMxw4VAiNf1VA= - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.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" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.10: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~1.2.0, gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -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-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -ghreleases@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" - integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== - dependencies: - after "~0.8.1" - ghrepos "~2.1.0" - ghutils "~3.2.0" - lodash.uniq "^4.5.0" - simple-mime "~0.1.0" - url-template "~2.0.6" - -ghrepos@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" - integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== - dependencies: - ghutils "~3.2.0" - -ghutils@~3.2.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" - integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== - dependencies: - jsonist "~2.1.0" - xtend "~4.0.1" - -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 sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -glob-parent@~5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -"glob@3 || 4 || 5 || 6 || 7", glob@7.1.6, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@5.0.x: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2, graceful-fs@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -he@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -hyperquest@~2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" - integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== - dependencies: - buffer-from "^0.1.1" - duplexer2 "~0.0.2" - through2 "~0.6.3" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@~1.3.0: - version "1.3.7" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" - integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== - -invariant@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" - integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A= - dependencies: - loose-envify "^1.0.0" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^3.0.0: - version "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-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-iojs@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz#4c11033b5d5d94d6eab3775dedc9be7d008325f1" - integrity sha1-TBEDO11dlNbqs3dd7cm+fQCDJfE= - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsonist@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz#c1377311e8fc857abe7aa3df197116a911f95324" - integrity sha512-8yqmWJAC2VaYoSKQAbsfgCpGY5o/1etWzx6ZxaZrC4iGaHrHUZEo+a2MyF8w+2uTavTlHdLWaZUoR19UfBstxQ== - dependencies: - bl "~3.0.0" - hyperquest "~2.1.3" - json-stringify-safe "~5.0.1" - xtend "~4.0.1" - -jsprim@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" - integrity sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg= - dependencies: - assert-plus "1.0.0" - extsprintf "1.0.2" - json-schema "0.2.3" - verror "1.3.6" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - -listenercount@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" - integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4, lodash@^4.17.4, lodash@^4.2.0: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== - -log-symbols@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== - dependencies: - chalk "^4.0.0" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg= - dependencies: - js-tokens "^3.0.0" - -memory-stream@0: - version "0.0.3" - resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz#ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f" - integrity sha1-6+jdHDuLw4wOeUHp3dWuvmtN6D8= - dependencies: - readable-stream "~1.0.26-2" - -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== - dependencies: - mime-db "1.44.0" - -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - -"minimatch@2 || 3", minimatch@3, minimatch@3.0.4, minimatch@^3.0.2, 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" - -minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minipass@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== - dependencies: - yallist "^4.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -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" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mocha@^8.0.1: - version "8.3.2" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" - integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.1" - debug "4.3.1" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.1.6" - growl "1.10.5" - he "1.2.0" - js-yaml "4.0.0" - log-symbols "4.0.0" - minimatch "3.0.4" - ms "2.1.3" - nanoid "3.1.20" - serialize-javascript "5.0.1" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - wide-align "1.1.3" - workerpool "6.1.0" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -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.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - -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== - -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - -node-abi@^2.2.0, node-abi@^2.21.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48" - integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg== - dependencies: - semver "^5.4.1" - -node-addon-api@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239" - integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw== - -node-cpplint@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-cpplint/-/node-cpplint-0.4.0.tgz#35827fe7b95ccceff0cd7f46ede4cba44b8ef88c" - integrity sha1-NYJ/57lczO/wzX9G7eTLpEuO+Iw= - dependencies: - colors "~0.6.2" - commander "~2.2.0" - -node-gyp@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" - integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.2" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.1.2" - request "^2.88.0" - rimraf "^2.6.3" - semver "^5.7.1" - tar "^4.4.12" - which "^1.3.1" - -node-gyp@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - -node-ninja@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" - integrity sha1-IKCeV7kuLfWRmT1L8JisPnJwYrY= - dependencies: - fstream "^1.0.0" - glob "3 || 4 || 5 || 6 || 7" - graceful-fs "^4.1.2" - minimatch "3" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2" - osenv "0" - path-array "^1.0.0" - request "2" - rimraf "2" - semver "2.x || 3.x || 4 || 5" - tar "^2.0.0" - which "1" - -noop-logger@^0.1.0, noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-path@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" - integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== - dependencies: - which "^1.2.10" - -npm-which@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" - integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= - dependencies: - commander "^2.9.0" - npm-path "^2.0.2" - which "^1.2.10" - -"npmlog@0 || 1 || 2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -npmlog@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6" - integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY= - dependencies: - ansi "~0.3.0" - are-we-there-yet "~1.0.0" - gauge "~1.2.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -nw-gyp@^3.6.3: - version "3.6.5" - resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.5.tgz#ccce42182229e44e7689da70675b4b8dd0ab0ab3" - integrity sha512-vYrOIYJEKpq9CfaHuiqEjV1rBYgr6uaUrPhPRiznb91LujkAUqGhQ5QqDC1bLdd+zo9jf2H0Zkl2M5zQB7+CuQ== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@0, osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -path-array@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" - integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= - dependencies: - array-index "^1.0.0" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -pathval@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -prebuild-install@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.1.tgz#6754fa6c0d55eced7f9e14408ff9e4cba6f097b4" - integrity sha512-M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.21.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.1.tgz#9d46a00f42b60ad1718479cc5e3d1ef4882b7f33" - integrity sha512-x0CkKDmHFwX49rTGEYJwB9jBQwJWxRzwUtP5PA9dP8khFGMm3oSFgYortxdlp0PkxB29EhWGp/KQE5g+adehYg== - dependencies: - cmake-js "~5.2.0" - detect-libc "^1.0.3" - each-series-async "^1.0.1" - execspawn "^1.0.1" - ghreleases "^3.0.2" - github-from-package "0.0.0" - glob "^7.1.6" - minimist "^1.1.2" - mkdirp "^0.5.1" - napi-build-utils "^1.0.1" - node-abi "^2.2.0" - node-gyp "^6.0.1" - node-ninja "^1.0.1" - noop-logger "^0.1.0" - npm-which "^3.0.1" - npmlog "^4.0.1" - nw-gyp "^3.6.3" - rc "^1.0.3" - run-waterfall "^1.1.6" - tar-stream "^2.1.0" - -private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - -psl@^1.1.28: - version "1.1.29" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" - integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -rc@^1.0.3, rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26-2: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@^3.0.1, 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== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== - dependencies: - picomatch "^2.2.1" - -regenerator-runtime@^0.10.0: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - dependencies: - is-finite "^1.0.0" - -request@2, request@^2.54.0, request@^2.88.0, request@^2.88.2: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -rimraf@2, rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -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== - dependencies: - glob "^7.1.3" - -rsvp@^3.0.13: - version "3.6.2" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" - integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== - -run-waterfall@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz#ae368b549b2f5171f86c2924492cab3352a6e9c5" - integrity sha512-iFPgh7SatHXOG1ClcpdwHI63geV3Hc/iL6crGSyBlH2PY7Rm/za+zoKz6FfY/Qlw5K7JwSol8pseO8fN6CMhhQ== - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - -safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safer-buffer@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -"semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^4.3.3: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= - -semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -serialize-javascript@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== - dependencies: - randombytes "^2.1.0" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -setimmediate@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-mime@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" - integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - -source-map-support@~0.2.8: - version "0.2.10" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" - integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w= - dependencies: - source-map "0.1.32" - -source-map@0.1.32: - version "0.1.32" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" - integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -splitargs@0: - version "0.0.7" - resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b" - integrity sha1-/p965lc3GzOxDLgNoUPPgknPazs= - -sshpk@^1.7.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" - integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg= - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - safer-buffer "^2.0.2" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -string-width@^1.0.1, string-width@^1.0.2, "string-width@^1.0.2 || 2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-json-comments@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.0, tar-stream@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" - integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - -tar@^4, tar@^4.4.12: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - -tar@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" - integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -through2@~0.6.3: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -traceur@0.0.x: - version "0.0.111" - resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz#c04de74d14696c3373427de4fc08ecaf913fc3a1" - integrity sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E= - dependencies: - commander "2.9.x" - glob "5.0.x" - rsvp "^3.0.13" - semver "^4.3.3" - source-map-support "~0.2.8" - -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-detect@^4.0.0, type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" - integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== - -type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unzipper@^0.8.13: - version "0.8.14" - resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b" - integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w== - dependencies: - big-integer "^1.6.17" - binary "~0.3.0" - bluebird "~3.4.1" - buffer-indexof-polyfill "~1.0.0" - duplexer2 "~0.1.4" - fstream "~1.0.10" - listenercount "~1.0.1" - readable-stream "~2.1.5" - setimmediate "~1.0.4" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== - dependencies: - punycode "^2.1.0" - -url-join@0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" - integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= - -url-template@~2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= - -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -verror@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" - integrity sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw= - dependencies: - extsprintf "1.0.2" - -which@1, which@^1.0.9, which@^1.2.10, which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@2.0.2, 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" - -wide-align@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - integrity sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w== - dependencies: - string-width "^1.0.2" - -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= - -workerpool@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" - integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -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== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -y18n@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== - -y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== - -yallist@^3.0.0, yallist@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@20.2.4, yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^3.6.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json index fdb5afe67a..78d5156f54 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json @@ -1,6 +1,6 @@ { - "version": "2.3.0", - "srcHash": "JyqtM1CCRgxAAdhgQYaIUYPnxEcDrlW1SjDCmsrPL34=", - "yarnHash": "0bym6i1f0i3bs4fncbiwzwmbxp7j14rz1v4kyvsl02qs97qw1jac", - "cargoHash": "sha256-EjtH96SC2kgan631+wlu9LStGKm6ljCR4x3/WpCTS0E=" + "version": "2.3.3", + "srcHash": "HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", + "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp", + "cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU=" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix new file mode 100644 index 0000000000..a30bfa2dcb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, protobuf +, libsecret +, libadwaita +, rustPlatform +, desktop-file-utils +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "flare"; + version = "0.6.0"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "Schmiddiii"; + repo = pname; + rev = version; + hash = "sha256-wY95sXWGDjEy8vvP79XliJOn5GQkAvDmOXKmRz0TPEw="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-J3MGQlPYGjhZKH599vfW2WhkXx+Tdr53PviiVpye4R0="; + }; + + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + libadwaita + libsecret + protobuf + ]; + + meta = { + changelog = "https://gitlab.com/Schmiddiii/flare/-/blob/${src.rev}/CHANGELOG.md"; + description = "An unofficial Signal GTK client"; + homepage = "https://gitlab.com/Schmiddiii/flare"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ dotlambda tomfitzhenry ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 1535b69423..6a1b5086bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; homepage = "https://github.com/8go/matrix-commander"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.seb314 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 3e5af22c82..a0e94dc0f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.11.13-sc.1", - "rev": "v1.11.13-sc.1", - "srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g", - "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn", - "jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al", - "reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn", - "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5" + "version": "1.11.22-sc.1", + "rev": "v1.11.22-sc.1", + "srcHash": "0di80hjd0d8bsbgbnddbmdjllc7cssgaxy27kd50j4dmw8qll1hv", + "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df", + "jsSdkYarnHash": "0a8c7y34wh8bk1v35sa1s3s4piqkzvhjrzzapack4kzl1pfn0vix", + "reactSdkYarnHash": "0nhw9vk0yk2v738b2w6jjq5pfib5j66m5maxczhm40zync8b1wmp", + "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 0573c7231e..cf2c44f5f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -58,13 +58,18 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Only affects unused scripts in $out/share/element/electron/scripts. Also + # breaks because there are some `node`-scripts with a `npx`-shebang and + # this shouldn't be in the closure just for unused scripts. + dontPatchShebangs = true; + buildPhase = '' runHook preBuild pushd element-desktop - npx tsc - yarn run i18n - node ./scripts/copy-res.js + yarn --offline run build:ts + yarn --offline run i18n + yarn --offline run build:res popd runHook postBuild @@ -97,10 +102,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # Do not attempt generating a tarball for element-web again. - # note: `doDist = false;` does not work. - distPhase = ";"; - # The desktop item properties should be kept in sync with data from upstream: # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 1fba61b8b0..2c34523f55 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.3.0"; - hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY="; + version = "6.4.1"; + hash = "sha256-/Rrph74nVr64Z6blNNn3oMM25YK92MZY/vuF1d+r6Yc="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.4.0-beta.1"; - hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU="; + version = "6.5.0-beta.2"; + hash = "sha256-cAX9oU3bJrTOH3RbbfUK+49OiRSLjEZLdpJNOMAa94I="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 904e47695d..35846f4b7e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20230128-1"; + version = "20230203"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y="; + sha256 = "sha256-xXIdXv2U5VpRSuJ9Kl6HMDBZGpXRYGPZFBBk9QYODtU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a62bf67790..f2e9deb981 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.5.3"; + version = "4.6.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -84,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l"; + sha256 = "1df9rx3a6xvgipgzn5h4jc46nsdkypl4255si606bkrccdz8bcrl"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d18761689e..cb132610d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/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.13.6.14918"; - versions.x86_64-darwin = "5.13.6.14918"; - versions.x86_64-linux = "5.13.5.431"; + versions.aarch64-darwin = "5.13.7.15481"; + versions.x86_64-darwin = "5.13.7.15481"; + versions.x86_64-linux = "5.13.7.683"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; + hash = "sha256-lCg8xCEuZSWnd4fieug9xjudE9q6pNICRsbvA4ATVK8="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; + hash = "sha256-jmMpkqUga/KQJfXFbGURcWQudnCKlIi5NGY6LuekjKw="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; + hash = "sha256-1aA3W9eXYhjxr39PoTSAVG7mToFInF7uz8MCiJhk/10="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index 241828fdfc..f46283583c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.9.4"; + version = "5.9.5"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM="; + hash = "sha256-w2thmF/UA42j3u3m4L+/onilQhwMOa7IJoOMZ/ERypw="; name="${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix index e00a177b67..e821b7ff58 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { description = "Your everyday IRC student"; homepage = "https://ellidri.org/senpai"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 7837393926..0a4a4a9d77 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -7,10 +7,16 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; postBuild = '' + declare -a schemas; + for plugin in ${toString plugins}; do + for schema in $plugin/share/gsettings-schemas/*; do + schemas+=($schema); + done + done for i in $out/bin/* $out/libexec/**; do if [ ! -d $i ]; then echo wrapping $i - wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" + wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" --prefix XDG_DATA_DIRS : "''${schemas[@]}" fi done diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix index de82535cd5..fb852f7604 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libiconv ruby ]; src = fetchFromGitHub { owner = "leahneukirchen"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 8fefcc1c31..6c705d7cd3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.7.1"; + version = "102.7.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "6310f3f122a1a61917ec2d0efe3a031b199ac13681e9fb4035abc0f4de0dbafb12accffbd63facb23f2cebf0124a13f7538a33176a2a513d1f685bee40db50ba"; + sha512 = "7371079d59cceb47fdd0e9661f79eae7510ab0f5bf8e80c21952dfb5fed3db72279a4ac9d3a3de3617194fb36a9420ae814a69ee19a93ba242d2aa2b921e3010"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index dc8c5729dd..1bda56c542 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa -, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, libGL, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator , makeWrapper }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator wayland ]; + runtimeDependencies = [ (lib.getLib systemd) libGL libnotify libappindicator wayland ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index 86f2467677..34a86c3140 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.0" = { + "@azure/core-client-1.7.1" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; - sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; + sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; }; }; "@azure/core-http-2.3.1" = { @@ -67,22 +67,22 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.5.0" = { + "@azure/core-lro-2.5.1" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; - sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; + sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; }; }; - "@azure/core-paging-1.4.0" = { + "@azure/core-paging-1.5.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; - sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; + sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; "@azure/core-rest-pipeline-1.10.1" = { @@ -193,13 +193,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.32.2" = { + "@azure/msal-browser-2.33.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.2"; + version = "2.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; - sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; + sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; + }; + }; + "@azure/msal-common-10.0.0" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; + sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; }; }; "@azure/msal-common-4.5.1" = { @@ -220,15 +229,6 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.1.1" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; - sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; - }; - }; "@azure/msal-node-1.0.0-beta.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; @@ -238,13 +238,13 @@ let sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; }; }; - "@azure/msal-node-1.14.6" = { + "@azure/msal-node-1.15.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.6"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; - sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; + sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -256,13 +256,13 @@ let sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/parser-7.20.13" = { + "@babel/parser-7.20.15" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.13"; + version = "7.20.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; - sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; + sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; }; }; "@babel/runtime-7.20.13" = { @@ -292,22 +292,22 @@ let sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; }; }; - "@codemirror/lang-css-6.0.1" = { + "@codemirror/lang-css-6.0.2" = { name = "_at_codemirror_slash_lang-css"; packageName = "@codemirror/lang-css"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.1.tgz"; - sha512 = "rlLq1Dt0WJl+2epLQeAsfqIsx3lGu4HStHCJu95nGGuz2P2fNugbU3dQYafr2VRjM4eMC9HviI6jvS98CNtG5w=="; + url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz"; + sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw=="; }; }; - "@codemirror/lang-javascript-6.1.2" = { + "@codemirror/lang-javascript-6.1.3" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.2.tgz"; - sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.3.tgz"; + sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w=="; }; }; "@codemirror/language-6.4.0" = { @@ -616,6 +616,51 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; + "@jsplumb/browser-ui-5.13.2" = { + name = "_at_jsplumb_slash_browser-ui"; + packageName = "@jsplumb/browser-ui"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.2.tgz"; + sha512 = "BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ=="; + }; + }; + "@jsplumb/common-5.13.2" = { + name = "_at_jsplumb_slash_common"; + packageName = "@jsplumb/common"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.2.tgz"; + sha512 = "ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q=="; + }; + }; + "@jsplumb/connector-bezier-5.13.2" = { + name = "_at_jsplumb_slash_connector-bezier"; + packageName = "@jsplumb/connector-bezier"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.2.tgz"; + sha512 = "AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg=="; + }; + }; + "@jsplumb/core-5.13.2" = { + name = "_at_jsplumb_slash_core"; + packageName = "@jsplumb/core"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.2.tgz"; + sha512 = "IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A=="; + }; + }; + "@jsplumb/util-5.13.2" = { + name = "_at_jsplumb_slash_util"; + packageName = "@jsplumb/util"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.2.tgz"; + sha512 = "POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g=="; + }; + }; "@kafkajs/confluent-schema-registry-1.0.6" = { name = "_at_kafkajs_slash_confluent-schema-registry"; packageName = "@kafkajs/confluent-schema-registry"; @@ -688,13 +733,13 @@ let sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; }; }; - "@lezer/lr-1.3.1" = { + "@lezer/lr-1.3.3" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.1.tgz"; - sha512 = "+GymJB/+3gThkk2zHwseaJTI5oa4AuOuj1I2LCslAVq1dFZLSX8SAe4ZlJq1TjezteDXtF/+d4qeWz9JvnrG9Q=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz"; + sha512 = "JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -769,13 +814,13 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@oclif/command-1.8.21" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; - sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.18.6" = { @@ -787,6 +832,15 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; + "@oclif/config-1.18.8" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.8.tgz"; + sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg=="; + }; + }; "@oclif/core-1.26.1" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; @@ -823,13 +877,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.9" = { + "@oclif/parser-3.8.10" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.9"; + version = "3.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz"; - sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz"; + sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ=="; }; }; "@oclif/screen-3.0.4" = { @@ -976,49 +1030,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.34.0" = { + "@sentry/core-7.36.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz"; - sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.36.0.tgz"; + sha512 = "lq1MlcMhvm7QIwUOknFeufkg4M6QREY3s61y6pm1o+o3vSqB7Hz0D19xlyEpP62qMn8OyuttVKOVK1UfGc2EyQ=="; }; }; - "@sentry/integrations-7.34.0" = { + "@sentry/integrations-7.36.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz"; - sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.36.0.tgz"; + sha512 = "wrRoUqdeGi64NNimGVk8U8DBiXamxTYPBux0/faFDyau8EJyQFcv8zOyB78Za4W2Ss3ZXNaE/WtFF8UxalHzBQ=="; }; }; - "@sentry/node-7.34.0" = { + "@sentry/node-7.36.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz"; - sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.36.0.tgz"; + sha512 = "nAHAY+Rbn5OlTpNX/i6wYrmw3hT/BtwPZ/vNU52cKgw7CpeE1UrCeFjnPn18rQPB7lIh7x0vNvoaPrfemRzpSQ=="; }; }; - "@sentry/types-7.34.0" = { + "@sentry/types-7.36.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz"; - sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.36.0.tgz"; + sha512 = "uvfwUn3okAWSZ948D/xqBrkc3Sn6TeHUgi3+p/dTTNGAXXskzavgfgQ4rSW7f3YD4LL+boZojpoIARVLodMGuA=="; }; }; - "@sentry/utils-7.34.0" = { + "@sentry/utils-7.36.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz"; - sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.36.0.tgz"; + sha512 = "mgDi5X5Bm0sydCzXpnyKD/sD98yc2qnKXyRdNX4HRRwruhC/P53LT0hGhZXsyqsB/l8OAMl0zWXJLg0xONQsEw=="; }; }; "@servie/events-1.0.0" = { @@ -1039,22 +1093,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.29" = { + "@swc/core-1.3.32" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz"; - sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.32.tgz"; + sha512 = "Yx/n1j+uUkcqlJAW8IRg8Qymgkdow6NHJZPFShiR0YiaYq2sXY+JHmvh16O6GkL91Y+gTlDUS7uVgDz50czJUQ=="; }; }; - "@swc/wasm-1.3.29" = { + "@swc/wasm-1.3.32" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz"; - sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.32.tgz"; + sha512 = "u27gmXtbe/y4M5fo38NCBKUFeFIWRCmppABxPvM9TsZ8KhO4EdZOI1L9sPHSZvVyAXRpnwC8cjYej/zOAZjAQA=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1192,13 +1246,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.16" = { + "@types/express-4.17.17" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.16"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; - sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; "@types/express-jwt-0.0.42" = { @@ -1282,13 +1336,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.11.18" = { + "@types/node-18.11.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.18"; + version = "18.11.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz"; + sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1381,13 +1435,13 @@ let sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; }; }; - "@types/validator-13.7.11" = { + "@types/validator-13.7.12" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.11"; + version = "13.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz"; - sha512 = "WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz"; + sha512 = "YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1912,13 +1966,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1304.0" = { + "aws-sdk-2.1310.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1304.0"; + version = "2.1310.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz"; - sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1310.0.tgz"; + sha512 = "D0m9uFUa1UVXWTe4GSyNJP4+6DXwboE2FEG/URkLoo4r9Q8LHxwNFCGkBhaoEwssREyRe2LOYS1Nag/6WyvC6Q=="; }; }; "aws-sign2-0.7.0" = { @@ -2038,13 +2092,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.0.1" = { + "better-sqlite3-8.1.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; - sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; + sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; }; }; "big-integer-1.6.51" = { @@ -2326,13 +2380,13 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; - "bull-4.10.2" = { + "bull-4.10.3" = { name = "bull"; packageName = "bull"; - version = "4.10.2"; + version = "4.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz"; - sha512 = "xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ=="; + url = "https://registry.npmjs.org/bull/-/bull-4.10.3.tgz"; + sha512 = "pp403srpkn9tYi7Z3Mu0sozehZ7rEEFGNJnN+nLxQwml6MySzefC9bPeCYedZoCkXdZ6VbIB8uNkMZg+hN/dAg=="; }; }; "busboy-1.6.0" = { @@ -2686,13 +2740,13 @@ let sha512 = "ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ=="; }; }; - "codemirror-lang-n8n-expression-0.1.0" = { + "codemirror-lang-n8n-expression-0.2.0" = { name = "codemirror-lang-n8n-expression"; packageName = "codemirror-lang-n8n-expression"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.1.0.tgz"; - sha512 = "20ss5p0koTu5bfivr1sBHYs7cpjWT2JhVB5gn7TX9WWPt+v/9p9tEcYSOyL/sm+OFuWh698Cgnmrba4efQnMCQ=="; + url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.2.0.tgz"; + sha512 = "kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ=="; }; }; "codepage-1.15.0" = { @@ -2929,13 +2983,13 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; - "content-type-1.0.4" = { + "content-type-1.0.5" = { name = "content-type"; packageName = "content-type"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; + sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; "convict-6.2.4" = { @@ -3361,13 +3415,13 @@ let sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; }; }; - "deepmerge-4.2.2" = { + "deepmerge-4.3.0" = { name = "deepmerge"; packageName = "deepmerge"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; + sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; }; }; "default-user-agent-1.0.0" = { @@ -5044,13 +5098,13 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; - "ics-2.41.0" = { + "ics-2.44.0" = { name = "ics"; packageName = "ics"; - version = "2.41.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/ics/-/ics-2.41.0.tgz"; - sha512 = "6oleMfOpdBIrZGMNrTutwW7eFwua8lOkymDNxMXlsVF00HghqH+I3S6frt3a2rfjXTlkI0qiY2rnsKP2JQ9vJA=="; + url = "https://registry.npmjs.org/ics/-/ics-2.44.0.tgz"; + sha512 = "JeiPjNeWkd7Qri/wfHqjZCtglVwRJRqy1MEFKn9QzatzxUyCOsx4YARPlLkU8UnPxpg4VtEjR+VRUG+Cvj6bDg=="; }; }; "ieee754-1.1.13" = { @@ -5908,15 +5962,6 @@ let sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; - "jsplumb-2.15.4" = { - name = "jsplumb"; - packageName = "jsplumb"; - version = "2.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.4.tgz"; - sha512 = "QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g=="; - }; - }; "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; @@ -6043,13 +6088,13 @@ let sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.18" = { + "libphonenumber-js-1.10.19" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.18"; + version = "1.10.19"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz"; - sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz"; + sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg=="; }; }; "libpq-1.8.12" = { @@ -6421,13 +6466,13 @@ let sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; }; }; - "logform-2.4.2" = { + "logform-2.5.0" = { name = "logform"; packageName = "logform"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.5.0.tgz"; + sha512 = "fsFiH2yjSCTmzotZ5JmEo0brQyJ7iHrc8pQ5pnHg6e1e5WfkqdNMDvgRWSfz+aCr3Y2YxYzHA4UKj+6QoctKrg=="; }; }; "long-4.0.0" = { @@ -6520,24 +6565,6 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-2.3.2" = { - name = "luxon"; - packageName = "luxon"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; - sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; - }; - }; - "luxon-2.5.2" = { - name = "luxon"; - packageName = "luxon"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz"; - sha512 = "Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA=="; - }; - }; "luxon-3.2.1" = { name = "luxon"; packageName = "luxon"; @@ -6844,13 +6871,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.0" = { + "minipass-4.0.2" = { name = "minipass"; packageName = "minipass"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.2.tgz"; + sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A=="; }; }; "minipass-collect-1.0.2" = { @@ -7051,13 +7078,13 @@ let sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; }; }; - "msgpackr-1.8.2" = { + "msgpackr-1.8.3" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; - sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; + sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; }; }; "mssql-7.3.5" = { @@ -7114,13 +7141,13 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.152.0" = { + "n8n-core-0.153.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.152.0"; + version = "0.153.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.152.0.tgz"; - sha512 = "Bx+4vv3E7SwjFvxLDqzpDbJwVzDUYAw1QTcqAfMnHpkUM9uxlYHV5U3kgSsjpkw0TAF7RVVroHWFYWgnrW9XHA=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.153.0.tgz"; + sha512 = "m5yikbWxe2IgA2P1ryUzlE4alNWPDha1vF3zoIgHfdZObR7UyoYohlJpT6l5LUcduCQVE87t1rspnJd4MY0hrQ=="; }; }; "n8n-design-system-0.52.0" = { @@ -7132,31 +7159,31 @@ let sha512 = "Dd6SdWYDjlhgrpPbof4DFPP4hPdpH9cA+3YkFSCgQLNyCi0RdqiQJqPQ5xQFlNVaxd6a7R69RHy/oNwt6/+cLw=="; }; }; - "n8n-editor-ui-0.179.0" = { + "n8n-editor-ui-0.180.2" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.179.0"; + version = "0.180.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.179.0.tgz"; - sha512 = "mo1HoCA7myKzkNkZgmjp9UZ5euxDUX+ZPAyLCoxI+HXki3mhVxELeffzbkBiXAfezi9xlaYAKzehg5HuUyiHjg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.2.tgz"; + sha512 = "5XIIDN6X2CbQtDFwthCOqanvkOgbbFu36h9LZb/eB8KdQKs5dxNFi958lIrKuyZaiPYBQTZCPZWMcqqie+9JIQ=="; }; }; - "n8n-nodes-base-0.211.0" = { + "n8n-nodes-base-0.212.2" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.211.0"; + version = "0.212.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.211.0.tgz"; - sha512 = "AoERAZJTuztzCuVvSeAPJk0fko4XcnlK7oweum08+0C1g0X1o9iHQE2kkoHwTxsY77eS6mRbGd2r6OCggpKftQ=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.2.tgz"; + sha512 = "kmuuZOvQ+c84Eap2TW/RUzTZffYznI9fscTUSZYd8xpFdbptIH9TL0pkkcKhybvOC5y0CFPeMKV5JcH0uEujmw=="; }; }; - "n8n-workflow-0.134.0" = { + "n8n-workflow-0.135.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.134.0"; + version = "0.135.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.134.0.tgz"; - sha512 = "m9sbI29zCXSeFprBEQ+Lqk1E53iI2Dbu0LoL+5Nw3fBcbxnTYCxReD9pSssZSKlHzb9BHSMSYeZk4pK5RyQuvw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.135.0.tgz"; + sha512 = "4KTWgul6DHk7rOP2Pj2XsEw4wWfJo29CCLXImgMHkOqR0SWxZT2lRvlqggxlDD1KkmnEddHghLzxOCGxgRHxFg=="; }; }; "named-placeholders-1.1.3" = { @@ -7267,13 +7294,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.31.0" = { + "node-abi-3.32.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.31.0"; + version = "3.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.32.0.tgz"; + sha512 = "HkwdiLzE/LeuOMIQq/dJq70oNyRc88+wt5CH/RXYseE00LkA/c4PkS6Ti1vE4OHYUiKjkwuxjWq9pItgrz8UJw=="; }; }; "node-abort-controller-2.0.0" = { @@ -7312,13 +7339,13 @@ let sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; - "node-fetch-2.6.8" = { + "node-fetch-2.6.9" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; }; }; "node-forge-1.3.1" = { @@ -8221,13 +8248,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.0.29" = { + "pinia-2.0.30" = { name = "pinia"; packageName = "pinia"; - version = "2.0.29"; + version = "2.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.29.tgz"; - sha512 = "5z/KpFecq/cIgfeTnulJXldiLcTITRkTe3N58RKYSj0Pc1EdR6oyCdnf5A9jLoVwBqX5LtHhd0kGlpzWvk9oiQ=="; + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz"; + sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; }; }; "popsicle-12.1.0" = { @@ -8347,13 +8374,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.3.0" = { + "posthog-node-2.4.0" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.3.0.tgz"; - sha512 = "VV4s1DP2DTAL1WaR4Detq28epLlX2DVWfr/+itRWLvDVFyK9EDbAMqBhOkh8dd3JPkng0kcIjJ8PFII/cCXP9A=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz"; + sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q=="; }; }; "prebuild-install-7.1.1" = { @@ -8518,13 +8545,13 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.2.0" = { + "protobufjs-7.2.1" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; - sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz"; + sha512 = "L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA=="; }; }; "proxy-addr-2.0.7" = { @@ -9454,13 +9481,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.17" = { + "snowflake-sdk-1.6.18" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.17"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.17.tgz"; - sha512 = "ui2zRPbXIK3qaW8zuQCy+mHTieN6U5yeoJmKkyhdnh/8qKOqfR9Csj5nv+bXm8Y64kG24sybtIfCzf8C9abUMQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz"; + sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ=="; }; }; "socks-2.7.1" = { @@ -10129,13 +10156,22 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; - "tinycolor2-1.5.2" = { + "tinycolor2-1.6.0" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; - sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz"; + sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; + }; + }; + "title-case-3.0.3" = { + name = "title-case"; + packageName = "title-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz"; + sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA=="; }; }; "tlds-1.236.0" = { @@ -10417,13 +10453,13 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; - "typescript-4.9.4" = { + "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; "uc.micro-1.0.6" = { @@ -10768,13 +10804,13 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.13" = { + "vm2-3.9.14" = { name = "vm2"; packageName = "vm2"; - version = "3.9.13"; + version = "3.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; - sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; + sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; }; }; "vue-2.6.14" = { @@ -11323,10 +11359,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.213.0"; + version = "0.214.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.213.0.tgz"; - sha512 = "O6ZOT3nhCSBXt0aA3OH64M+6UNwVO7coURqTaCI0oVwbaH387OawtKn+mVnn5Jho52hAAZAoHdF1RVal2LQtJQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.214.2.tgz"; + sha512 = "9KbRJMT8/f4+5kiCnqZbe+ETKdBnBb5VJtw7DUbtu3Uj327dtGlPeX2E/kgXwwonnkO6XgdOteJZDSiixxozbg=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11350,7 +11386,7 @@ in sources."tslib-2.5.0" ]; }) - (sources."@azure/core-client-1.7.0" // { + (sources."@azure/core-client-1.7.1" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -11364,12 +11400,12 @@ in ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.5.0" // { + (sources."@azure/core-lro-2.5.1" // { dependencies = [ sources."tslib-2.5.0" ]; }) - (sources."@azure/core-paging-1.4.0" // { + (sources."@azure/core-paging-1.5.0" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -11416,15 +11452,15 @@ in ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/msal-browser-2.32.2" // { + (sources."@azure/msal-browser-2.33.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { + (sources."@azure/msal-node-1.15.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) (sources."@azure/storage-blob-12.12.0" // { @@ -11433,12 +11469,12 @@ in sources."tslib-2.5.0" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/runtime-7.20.13" sources."@codemirror/autocomplete-6.4.0" sources."@codemirror/commands-6.2.0" - sources."@codemirror/lang-css-6.0.1" - sources."@codemirror/lang-javascript-6.1.2" + sources."@codemirror/lang-css-6.0.2" + sources."@codemirror/lang-javascript-6.1.3" sources."@codemirror/language-6.4.0" sources."@codemirror/lint-6.1.0" sources."@codemirror/state-6.2.0" @@ -11482,7 +11518,7 @@ in dependencies = [ sources."@grpc/proto-loader-0.7.4" sources."long-5.2.1" - sources."protobufjs-7.2.0" + sources."protobufjs-7.2.1" sources."yargs-16.2.0" ]; }) @@ -11504,6 +11540,11 @@ in sources."@jridgewell/trace-mapping-0.3.9" sources."@js-joda/core-5.5.2" sources."@jsdevtools/ono-7.1.3" + sources."@jsplumb/browser-ui-5.13.2" + sources."@jsplumb/common-5.13.2" + sources."@jsplumb/connector-bezier-5.13.2" + sources."@jsplumb/core-5.13.2" + sources."@jsplumb/util-5.13.2" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -11512,7 +11553,7 @@ in sources."@lezer/highlight-1.1.3" sources."@lezer/html-1.3.0" sources."@lezer/javascript-1.4.1" - sources."@lezer/lr-1.3.1" + sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" (sources."@n8n_io/license-sdk-1.8.0" // { dependencies = [ @@ -11529,8 +11570,8 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@oclif/command-1.8.21" - (sources."@oclif/config-1.18.6" // { + sources."@oclif/command-1.8.22" + (sources."@oclif/config-1.18.8" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -11550,9 +11591,14 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.5" + (sources."@oclif/help-1.0.5" // { + dependencies = [ + sources."@oclif/config-1.18.6" + sources."tslib-2.5.0" + ]; + }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.9" // { + (sources."@oclif/parser-3.8.10" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -11587,15 +11633,15 @@ in sources."domhandler-5.0.3" ]; }) - sources."@sentry/core-7.34.0" - sources."@sentry/integrations-7.34.0" - sources."@sentry/node-7.34.0" - sources."@sentry/types-7.34.0" - sources."@sentry/utils-7.34.0" + sources."@sentry/core-7.36.0" + sources."@sentry/integrations-7.36.0" + sources."@sentry/node-7.36.0" + sources."@sentry/types-7.36.0" + sources."@sentry/utils-7.36.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/wasm-1.3.32" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" @@ -11610,7 +11656,7 @@ in sources."@types/connect-3.4.35" sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.16" + sources."@types/express-4.17.17" sources."@types/express-jwt-0.0.42" sources."@types/express-serve-static-core-4.17.33" sources."@types/express-unless-2.0.1" @@ -11620,7 +11666,7 @@ in sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11635,7 +11681,7 @@ in sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/uuid-9.0.0" - sources."@types/validator-13.7.11" + sources."@types/validator-13.7.12" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11723,7 +11769,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1304.0" // { + (sources."aws-sdk-2.1310.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11754,7 +11800,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.0.1" + sources."better-sqlite3-8.1.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" sources."bignumber.js-2.4.0" @@ -11788,7 +11834,7 @@ in sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bufferutil-4.0.7" - (sources."bull-4.10.2" // { + (sources."bull-4.10.3" // { dependencies = [ sources."cron-parser-4.7.1" ]; @@ -11865,7 +11911,7 @@ in }) sources."cluster-key-slot-1.1.2" sources."codemirror-lang-html-n8n-1.0.0" - sources."codemirror-lang-n8n-expression-0.1.0" + sources."codemirror-lang-n8n-expression-0.2.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -11903,7 +11949,7 @@ in ]; }) sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convict-6.2.4" sources."cookie-0.4.2" (sources."cookie-parser-1.4.6" // { @@ -12188,7 +12234,7 @@ in sources."homedir-polyfill-1.0.3" (sources."html-to-text-9.0.3" // { dependencies = [ - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."dom-serializer-2.0.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" @@ -12206,7 +12252,7 @@ in sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" - sources."ics-2.41.0" + sources."ics-2.44.0" sources."ieee754-1.2.1" sources."ignore-5.2.4" (sources."imap-0.8.19" // { @@ -12315,7 +12361,6 @@ in }) sources."jsonschema-1.4.1" sources."jsonwebtoken-9.0.0" - sources."jsplumb-2.15.4" sources."jsprim-1.4.2" sources."jwa-1.4.1" (sources."jwks-rsa-1.12.3" // { @@ -12337,7 +12382,7 @@ in sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.0" - sources."libphonenumber-js-1.10.18" + sources."libphonenumber-js-1.10.19" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -12382,7 +12427,7 @@ in sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" sources."lodash.zipobject-4.1.3" - sources."logform-2.4.2" + sources."logform-2.5.0" sources."long-4.0.0" sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { @@ -12442,11 +12487,7 @@ in ]; }) sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-4.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12511,7 +12552,7 @@ in sources."mqtt-packet-6.10.0" sources."ms-2.1.2" sources."msal-1.4.17" - sources."msgpackr-1.8.2" + sources."msgpackr-1.8.3" (sources."mssql-8.1.4" // { dependencies = [ sources."commander-9.5.0" @@ -12527,7 +12568,7 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.152.0" // { + (sources."n8n-core-0.153.0" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" @@ -12540,22 +12581,13 @@ in sources."vue2-boring-avatars-0.3.8" ]; }) - (sources."n8n-editor-ui-0.179.0" // { - dependencies = [ - sources."luxon-2.5.2" - ]; - }) - (sources."n8n-nodes-base-0.211.0" // { + sources."n8n-editor-ui-0.180.2" + (sources."n8n-nodes-base-0.212.2" // { dependencies = [ sources."chokidar-3.5.2" - sources."luxon-2.3.2" - ]; - }) - (sources."n8n-workflow-0.134.0" // { - dependencies = [ - sources."luxon-2.3.2" ]; }) + sources."n8n-workflow-0.135.0" (sources."named-placeholders-1.1.3" // { dependencies = [ sources."lru-cache-7.14.1" @@ -12576,11 +12608,11 @@ in sources."tslib-2.5.0" ]; }) - sources."node-abi-3.31.0" + sources."node-abi-3.32.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ @@ -12728,7 +12760,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.0.29" + sources."pinia-2.0.30" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -12741,7 +12773,7 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.3.0" // { + (sources."posthog-node-2.4.0" // { dependencies = [ sources."axios-0.27.2" ]; @@ -12872,7 +12904,7 @@ in sources."safer-buffer-2.1.2" (sources."sanitize-html-2.7.3" // { dependencies = [ - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" ]; }) sources."sax-1.2.4" @@ -12930,13 +12962,11 @@ in sources."tslib-2.5.0" ]; }) - (sources."snowflake-sdk-1.6.17" // { + (sources."snowflake-sdk-1.6.18" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" - sources."jsonwebtoken-8.5.1" sources."mkdirp-1.0.4" - sources."semver-5.7.1" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; @@ -13053,7 +13083,12 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" + (sources."title-case-3.0.3" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."tlds-1.236.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -13130,7 +13165,7 @@ in ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" @@ -13192,7 +13227,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."vue-2.7.14" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" diff --git a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix index 50949da753..0b6d71b3ad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-NHTS9YajVjyAjSEQxMqyyY2Hwd30pjnIthZ+1jroqTE="; + sha256 = "sha256-ZJnQiTcfvxHFgRNytQANs/lF4hy0S0cXOy8IuGECYi0="; }; - vendorSha256 = "sha256-1sXG/xEzPVN1aRCsYqUee9aidT+ognZszOC7SR8YArw="; + vendorHash = "sha256-TLij88IksL0+pARKVhEhPg6qUPAXMlL2DWJk4ynahUs="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch index ab7cb9bffa..260a7dd4dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -8,18 +8,13 @@ Subject: [PATCH] Explicitly copy dbus files into the store dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt -index 1f35335..7f76951 100644 +index 2e7349ef7..512d4b188 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt -@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable) - ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable) - +@@ -1,5 +1,6 @@ macro(dbus_add_activation_service _sources) -- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir) + pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") foreach (_i ${_sources}) get_filename_component(_service_file ${_i} ABSOLUTE) string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) --- -2.19.2 - diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index e409551f12..24d0cdab72 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.6"; + version = "3.7.1"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; + sha256 = "sha256-MbxGS1Msb3xCW0z8FrIZEY3XaBa4BmN+JFBkV/Pf79A="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix index fda9d87681..1291caa088 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -27,13 +27,9 @@ stdenv.mkDerivation rec { '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; - buildInputs = (with ocamlPackages; [ - ocaml - camlp4 - num - ]) ++ [ - zlib - ]; + strictDeps = true; + nativeBuildInputs = with ocamlPackages; [ ocaml camlp4]; + buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { broken = stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix index 4c96200cc6..a21a9fef38 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix @@ -1,22 +1,25 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "storrent-unstable"; - version = "2021-10-10"; + pname = "storrent"; + version = "unstable-2023-01-14"; src = fetchFromGitHub { owner = "jech"; repo = "storrent"; - rev = "681733cf74de08bea251ada672ea8c666eb1b679"; - sha256 = "0grrqgawswb44fahf40060jl691rlyccwlqkljvgy8mzzw1kjzj4"; + rev = "86270ee777a19a521f8898a179485e0347f90ce0"; + hash = "sha256-JYNtuyk4hhe1jZgY/5Bz91Ropdw/U7n1VKHYkdUjZ0I="; }; - vendorSha256 = "0sz2fz7bqgwd5i7sacyxs7bmb8ly6xrxrakqi9c446vzlkh898hj"; + vendorHash = "sha256-iPKZPXsa6ya29N/u9QYd5LAm42+FtHZLGStRDxsAxe4="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/jech/storrent"; description = "An implementation of the BitTorrent protocol that is optimised for streaming media"; license = licenses.mit; + platforms = platforms.linux; maintainers = [ maintainers.marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index f127d7c53d..759388cbd4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ "out" "dev" ]; - version = "15.35.7"; + version = "15.38.3"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc="; + url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x/teamviewer_${version}_amd64.deb"; + sha256 = "sha256-+GGpGV8rl15VQvPRA2PWngQI4VoxCrZ0ArEm9FgdOVE="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index f51c8d051a..5036eb998b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.40"; + version = "3.41"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130="; + hash = "sha256-sNeuIcRJ249F9m7NBi5Vh4HMhWwDpNHAZsit1auVI5U="; }; - vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo="; + vendorHash = "sha256-ZtHgZ0Mur102H2EvifsK3HYUQaI1dFMh/6eiJO09HBc="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix index 6dc59e1432..074d636ff8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix @@ -1,9 +1,11 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , libpcap , stdenv +, alsa-lib +, expat , fontconfig , libGL , xorg @@ -12,20 +14,24 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.0.1"; + version = "1.1.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-8K774j04BOEuJjnFYjaSctPwBrKYYKqjFS2+PyxJ2FM="; + src = fetchFromGitHub { + owner = "gyulyvgc"; + repo = "sniffnet"; + rev = "v${version}"; + hash = "sha256-zqk0N1S0vylleyyXaSflIZyWncZV0+wbSy1oAbyLx/4="; }; - cargoSha256 = "sha256-096i4wDdoJCICd0L2QNY+7cKHQnijK22zj4XaQNuko8="; + cargoHash = "sha256-9CTA7Yh2O5S8DvRjwvkrb4ye0/8f+l0tsTxNBMmxLpQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + expat fontconfig libGL xorg.libX11 @@ -34,6 +40,7 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit + rustPlatform.bindgenHook ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix index ae424a1fe5..58ffecef72 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix @@ -60,6 +60,6 @@ buildGoModule rec { homepage = "https://soju.im"; changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ azahi malvo ]; + maintainers = with maintainers; [ azahi malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 97ee3ed586..c6ce7c8f59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -23,9 +23,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; }; - nativeBuildInputs = [ makeWrapper ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocamlPackages.ocaml ] ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ ocamlPackages.ocaml ncurses ]; + buildInputs = [ ncurses ]; preBuild = lib.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix index f24e1255d5..6c6dddee17 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-07-08"; + version = "unstable-2022-12-19"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; - sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; + rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c"; + sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix index 0c47fc323a..23c7916354 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-oKkZC9fi5xPnLTI00MnG2gMjzMZHMNFI77ztbR4KQo4="; + hash = "sha256-c8X0kedfM8DPTEQAbh8cXIfEvxG2cdUD3twVHs0/k7U"; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sbyAyjxpol2SBxoLUsiPGfkP2diBPgJW0vEDHYWgmLU="; + hash = "sha256-TS/Q6T3bPjkk1bfINTR6bcPy8fnbAxbKJUrx2pYsPWY="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Fast and secure file transfer"; homepage = "https://apps.gnome.org/app/app.drey.Warp"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index 5828ac35fc..ce6988e6e6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -10,7 +10,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; }; - pythonRelaxDeps = [ "cheroot" ]; + patches = [ + ./flask-babel.patch + ]; + + pythonRelaxDeps = [ + "cheroot" + "Flask-Babel" + ]; nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; @@ -20,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { cheroot click flask - flaskbabel + flask-babel jaraco_functools jinja2 markdown2 diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/flask-babel.patch b/third_party/nixpkgs/pkgs/applications/office/fava/flask-babel.patch new file mode 100644 index 0000000000..739be6327c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/fava/flask-babel.patch @@ -0,0 +1,14 @@ +diff --git a/src/fava/application.py b/src/fava/application.py +index 811c1de4..19de051a 100644 +--- a/src/fava/application.py ++++ b/src/fava/application.py +@@ -148,8 +148,7 @@ def get_locale() -> str | None: + return request.accept_languages.best_match(["en"] + LANGUAGES) + + +-BABEL = Babel(app) +-BABEL.localeselector(get_locale) ++BABEL = Babel(app, locale_selector=get_locale) + + + for function in template_filters.FILTERS: diff --git a/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix b/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix index 861ec4d99e..e3e3106b83 100644 --- a/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , shared-mime-info # Qt +, qtnetworkauth , qtxmlpatterns , qtwebengine , qca-qt5 @@ -28,11 +29,13 @@ mkDerivation rec { pname = "kbibtex"; - version = "0.9.2"; + version = "0.9.3.1"; - src = fetchurl { - url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz"; - sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr"; + src = let + majorMinorPatch = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); + in fetchurl { + url = "mirror://kde/stable/KBibTeX/${majorMinorPatch}/kbibtex-${version}.tar.xz"; + hash = "sha256-kH/E5xv9dmzM7WrIMlGCo4y0Xv/7XHowELJP3OJz8kQ="; }; nativeBuildInputs = [ @@ -41,6 +44,7 @@ mkDerivation rec { ]; buildInputs = [ + qtnetworkauth qtxmlpatterns qtwebengine qca-qt5 diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index fdf76152a6..6590e62557 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -110,6 +110,7 @@ , wrapQtAppsHook ? null , variant ? "fresh" , symlinkJoin +, postgresql } @ args: assert builtins.elem variant [ "fresh" "still" ]; @@ -404,6 +405,7 @@ in "--with-system-libwps" "--with-system-openldap" "--with-system-coinmp" + "--with-system-postgresql" # Without these, configure does not finish "--without-junit" @@ -418,7 +420,6 @@ in # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" - "--disable-postgresql-sdbc" "--disable-firebird-sdbc" "--without-fonts" "--without-doxygen" @@ -546,6 +547,7 @@ in pam perl poppler + postgresql python3 sane-backends unixODBC diff --git a/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix b/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix index e400c88df5..e9fdd485be 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix @@ -49,13 +49,10 @@ stdenv.mkDerivation rec { --replace "1.2.0" "${libadwaita.version}" ''; - postInstall = '' - ln -s $out/bin/io.posidon.Paper $out/bin/paper - ''; - meta = with lib; { - description = "Take notes in Markdown"; - homepage = "https://posidon.io/paper/"; + description = "A pretty note-taking app for GNOME"; + homepage = "https://gitlab.com/posidon_software/paper"; + mainProgram = "io.posidon.Paper"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ j0lol ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index e0bfa57b1e..38a15e8bef 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.60.2"; + version = "0.61.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4="; + hash = "sha256-lpKnhAF/VsbLOHkIy1TFqjT0yKlFMNsN+yMUmpBAZKY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/rime-cli/default.nix b/third_party/nixpkgs/pkgs/applications/office/rime-cli/default.nix new file mode 100644 index 0000000000..5dd412a450 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/rime-cli/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "rime-cli"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "puddinging"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CI0Jva7oA/zUGatv+wCdByqbTBNQRw+4clr8IDKX6HQ="; + }; + + vendorHash = null; + + meta = with lib; { + homepage = "https://github.com/puddinging/rime-cli"; + changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}"; + description = "A command line tool to add customized vocabulary for Rime IME"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index 5566906919..17b4089ed7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-01-23"; + version = "unstable-2023-01-31"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; - sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; + rev = "44206849d03c8983e41d2aeca70a06e04365d88d"; + sha256 = "bUyM0zWVO7HWBiWi0mhkDlVxgqMHoFiR78XpiG8q/V4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix index 8158e4d6ea..1e1800fad4 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix @@ -8,6 +8,7 @@ , kcoreaddons , kdbusaddons , ki18n +, kirigami-addons , kirigami2 , knotifications , kpurpose @@ -19,8 +20,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "22.11" -, cargoSha256 ? "sha256-l1+nRXGt6Oga9yFJ3sVNitUN4XNcVjT1bJwi2XlleF4=" +, cargoShaForVersion ? "23.01.0" +, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk=" }: # Guard against incomplete updates. @@ -57,6 +58,7 @@ mkDerivation rec { kcoreaddons kdbusaddons ki18n + kirigami-addons kirigami2 knotifications kpurpose diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh b/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh index 96bb4eb090..ffcf74a5f7 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.11/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/23.01.0/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix index 1903bf259b..59b4553982 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix @@ -9,6 +9,7 @@ , kconfig , kcoreaddons , ki18n +, kirigami-addons , kirigami2 , networkmanager-qt , qtkeychain @@ -40,6 +41,7 @@ mkDerivation rec { kconfig kcoreaddons ki18n + kirigami-addons kirigami2 networkmanager-qt qtkeychain diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kweather.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kweather.nix index 49dcb1db99..d6a1f999ce 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kweather.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kweather.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , kconfig +, kholidays , ki18n , kirigami-addons , kirigami2 @@ -26,6 +27,7 @@ mkDerivation rec { buildInputs = [ kconfig + kholidays ki18n kirigami-addons kirigami2 diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix index 81041b2293..c9753babea 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix @@ -8,6 +8,7 @@ , kdeclarative , ki18n , kirigami2 +, mpv , qtmultimedia , qtquickcontrols2 , yt-dlp @@ -26,6 +27,7 @@ mkDerivation { kdeclarative ki18n kirigami2 + mpv qtmultimedia qtquickcontrols2 ] ++ (with gst_all_1; [ diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix index 7ec5541f48..7a2a3c0af8 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix @@ -12,6 +12,7 @@ , kcontacts , ki18n , kio +, kirigami-addons , kirigami2 , knotifications , kpeople @@ -40,6 +41,7 @@ gcc11Stdenv.mkDerivation rec { kcontacts ki18n kio + kirigami-addons kirigami2 knotifications kpeople diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix index a30966847a..42e0612cf8 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix @@ -4,195 +4,187 @@ { alligator = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/alligator-22.11.tar.xz"; - sha256 = "02hg42mmvykq71my6wbgc3yri4c3mr4bp73b7p21j1b8m3x0ycsl"; - name = "alligator-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/alligator-23.01.0.tar.xz"; + sha256 = "00vcj8dvzqj9vhq60ygqj62vx26lnai1j7117q0klp8wc9vngbvc"; + name = "alligator-23.01.0.tar.xz"; }; }; angelfish = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/angelfish-22.11.tar.xz"; - sha256 = "07gp6468c7rhf3hzzk6qyz4kcah0s1wnn5r3mx7qmg777xaans9y"; - name = "angelfish-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/angelfish-23.01.0.tar.xz"; + sha256 = "1pzms8xj57r8cv400fbcj9f4v8bs8xlws0f8zgak57jw5yxs073p"; + name = "angelfish-23.01.0.tar.xz"; }; }; audiotube = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/audiotube-22.11.tar.xz"; - sha256 = "0ga7ag8v9l91j5rrn02kk73zl29lwigcql1xfh7yw5cnky3xd13q"; - name = "audiotube-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/audiotube-23.01.0.tar.xz"; + sha256 = "0cjyjqin8zmgav3wf96zv2kr0ifn4xk4il1l5ybwf4k73qg1387x"; + name = "audiotube-23.01.0.tar.xz"; }; }; calindori = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/calindori-22.11.tar.xz"; - sha256 = "1mgdd61zmnjbpcwkaq2aiawksf1s86b05sq502by6gpdrwndhb5c"; - name = "calindori-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/calindori-23.01.0.tar.xz"; + sha256 = "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl"; + name = "calindori-23.01.0.tar.xz"; }; }; kalk = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kalk-22.11.tar.xz"; - sha256 = "0ri39455341nw6bn0lphky6n2b4ib9g4i24f6gzc0adnbhbpxdiq"; - name = "kalk-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kalk-23.01.0.tar.xz"; + sha256 = "1d5xlinrwjyxfr7ibxjjgbqmy69w6sgxxdpfn1x1wccnjfld4zqf"; + name = "kalk-23.01.0.tar.xz"; }; }; kasts = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kasts-22.11.tar.xz"; - sha256 = "049700i15cw07c6053iml1q3h5mni24kdf8nvkdafdafhslb84i9"; - name = "kasts-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kasts-23.01.0.tar.xz"; + sha256 = "09xvgd5vdmniqlnaxrim9d0rpv2qkdz91jq168gzl1kczl26pivf"; + name = "kasts-23.01.0.tar.xz"; }; }; kclock = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kclock-22.11.tar.xz"; - sha256 = "02v64zfbv1g3q4w79d0r8rxqiqsnxms7dgkjv09bp1gl1asqx354"; - name = "kclock-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kclock-23.01.0.tar.xz"; + sha256 = "0fxda2cqi9qqj2lkzs08jr8i35jzzy5z76k2mbz2qyfmby7hsz1r"; + name = "kclock-23.01.0.tar.xz"; }; }; keysmith = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/keysmith-22.11.tar.xz"; - sha256 = "1aimsgwk80yvncbsjnaxvr6aj8y4g40dpwfv0qi0k7b3xkrmqdk5"; - name = "keysmith-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/keysmith-23.01.0.tar.xz"; + sha256 = "0m5gbf3rw1l6qx5aphr57726p6v5nl2g718ainxa689p075smfbf"; + name = "keysmith-23.01.0.tar.xz"; }; }; khealthcertificate = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/khealthcertificate-22.11.tar.xz"; - sha256 = "0gw6j70k0nvbfb1vfj8b64vfipdckzd8hqqmp9vrmsg7y8g8n0hi"; - name = "khealthcertificate-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/khealthcertificate-23.01.0.tar.xz"; + sha256 = "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm"; + name = "khealthcertificate-23.01.0.tar.xz"; }; }; koko = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/koko-22.11.tar.xz"; - sha256 = "1jqjjd9spyppdbijdnvci742wj80p10pfbjp1hyc0y4zdjic67bv"; - name = "koko-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/koko-23.01.0.tar.xz"; + sha256 = "1bfbfwavphj3bnf8icnakbdaa6a7i0fgyhs8xa73clwig54fk4np"; + name = "koko-23.01.0.tar.xz"; }; }; kongress = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kongress-22.11.tar.xz"; - sha256 = "03r8xck9vxl3al3f5v6g0yzqzs3yxl3lg7zg73ik22q6z2rb1adb"; - name = "kongress-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kongress-23.01.0.tar.xz"; + sha256 = "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5"; + name = "kongress-23.01.0.tar.xz"; }; }; krecorder = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/krecorder-22.11.tar.xz"; - sha256 = "1wiihcp1c0wc7ssj9hj18rnzf8synaxmq6b0m2m286x4zibl50wb"; - name = "krecorder-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/krecorder-23.01.0.tar.xz"; + sha256 = "0aja3w8qbp96h43igajs068s89gf6nn7zwf6c813rbyqzl350phn"; + name = "krecorder-23.01.0.tar.xz"; }; }; ktrip = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/ktrip-22.11.tar.xz"; - sha256 = "07mjf9jpj20ixhswy4byqy3m4sr1qylwlvq2prabn11j42ahpsy7"; - name = "ktrip-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/ktrip-23.01.0.tar.xz"; + sha256 = "1l69fd1hhclm9212h6zm4nhkc0dg2wl47jw7wl9s6vy3xvmysihm"; + name = "ktrip-23.01.0.tar.xz"; }; }; kweather = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kweather-22.11.tar.xz"; - sha256 = "0sqc74yp5hvrjagax6nj0gm4qvbxqr66706yh12abcn9gpl33ndl"; - name = "kweather-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kweather-23.01.0.tar.xz"; + sha256 = "1hcb8jzx2bwcyxphya7kx7q2yri1w0k2753xiibw1hlgmb3qzr7s"; + name = "kweather-23.01.0.tar.xz"; }; }; neochat = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/neochat-22.11.tar.xz"; - sha256 = "1gnhk9hww05bc4y8jd4sg3146c6m96ds2saajrnzyc6963j2ndi5"; - name = "neochat-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/neochat-23.01.0.tar.xz"; + sha256 = "0pkas8whwy1ih4sx9vaa7k55iiiy955dh4d53i4l1d0sjdf8pysd"; + name = "neochat-23.01.0.tar.xz"; }; }; plasma-dialer = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-dialer-22.11.tar.xz"; - sha256 = "1qx7xmvfszpsrb2jylnwfs8rhr09kxvy5vnyzzcds248ljh5l6dy"; - name = "plasma-dialer-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-dialer-23.01.0.tar.xz"; + sha256 = "0n9g3jf71lpcwlwr1ia1i6kh0kiv2vizssni1df3cwskd7hivn7h"; + name = "plasma-dialer-23.01.0.tar.xz"; }; }; plasma-phonebook = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-phonebook-22.11.tar.xz"; - sha256 = "02sj6v18w63ixy0c93fm4j9n4q98497qrb509q84618gry4cazly"; - name = "plasma-phonebook-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-phonebook-23.01.0.tar.xz"; + sha256 = "0pprfgims9h6g1xw48w66bqkmqp7qp7gkc7k4zbj3lgmmnwh6z9i"; + name = "plasma-phonebook-23.01.0.tar.xz"; }; }; plasma-settings = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-settings-22.11.tar.xz"; - sha256 = "0pg71plcbn4zkwxwcvay9swaa5xn3mnljdpnh4i8f86x2pa1pq5j"; - name = "plasma-settings-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-settings-23.01.0.tar.xz"; + sha256 = "0fz0zjyh15ma6kv79pm0gc92iz6gikxyr4afkyzabzk9559dv1p7"; + name = "plasma-settings-23.01.0.tar.xz"; }; }; plasmatube = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasmatube-22.11.tar.xz"; - sha256 = "0vgxvyw4yl91kaj9cnjf455mpj4a5rh5f1z0in8k9p2jbs8wmjil"; - name = "plasmatube-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasmatube-23.01.0.tar.xz"; + sha256 = "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj"; + name = "plasmatube-23.01.0.tar.xz"; }; }; qmlkonsole = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/qmlkonsole-22.11.tar.xz"; - sha256 = "03hwyrl6rb7yidw0nadis6csb6snpfv137j46rbpl35vrqrnrh5i"; - name = "qmlkonsole-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/qmlkonsole-23.01.0.tar.xz"; + sha256 = "07h2pkz9h5lm232jasf6znf0i2p5c5qxnjac1d51qf8rfm0fp1q3"; + name = "qmlkonsole-23.01.0.tar.xz"; }; }; spacebar = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/spacebar-22.11.tar.xz"; - sha256 = "1q0nyfvssiz5i19wyk4pvazax3vvk945cmknw4l51mpcc3hnc1v5"; - name = "spacebar-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/spacebar-23.01.0.tar.xz"; + sha256 = "0srwvbnb80cgxkjjq2ch1lrbki7m169i86hig41h368wr9nmjnsl"; + name = "spacebar-23.01.0.tar.xz"; }; }; telly-skout = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/telly-skout-22.11.tar.xz"; - sha256 = "0sfdia4jwcv24z5d3qykqv7ncr2c5v7ywq471nggwpcr22bwzn6x"; - name = "telly-skout-22.11.tar.xz"; - }; - }; - tokodon = { - version = "22.11"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/tokodon-22.11.tar.xz"; - sha256 = "0afrqih1bkgg0xqr81sq9q3glyhy8347p8vzddl42zsxax9wki59"; - name = "tokodon-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/telly-skout-23.01.0.tar.xz"; + sha256 = "1wcabca1wlxjna4bd1blpwh7hi1wrcmn8bc06g8mpdzm8756d7sk"; + name = "telly-skout-23.01.0.tar.xz"; }; }; vakzination = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/vakzination-22.11.tar.xz"; - sha256 = "0587p5q9v0lh3nz00dfa8kym36xcgcg8n4alnchk6kr8c479kmk6"; - name = "vakzination-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/vakzination-23.01.0.tar.xz"; + sha256 = "1lx46r46xq18a1pxa6qhnwks43w022fkbrvylb84ycy59djq371n"; + name = "vakzination-23.01.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix index a412835c8c..f93336d40f 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix @@ -34,14 +34,14 @@ libsForQt5.mkDerivation rec { pname = "tokodon"; - version = "22.11.2"; + version = "23.01.0"; # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo. src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - hash = "sha256-uE9iHZDfpn1NTCeJPgsp2WBe0curdguTUbMTrkrmJ6M="; + hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix index cfb1f367ad..9a48854ccc 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix @@ -1,18 +1,19 @@ { lib , stdenv , fetchFromGitLab +, nix-update-script , nwjs }: stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.0110"; + version = "1.23.0206"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-yQWdBNt7maYTzroB+P1hsGIeivkP+soR3/b847HLYZY="; + sha256 = "sha256-XWjKJga9aQrMb0ZfA4ElsPU1CfMwFtwYSK1vjgtlKes="; }; postPatch = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "An amateur radio companion to WSJT-X or JTDX"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix index 1180f5a941..647f3efd67 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hackrf"; - version = "2022.09.1"; + version = "2023.01.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "hackrf"; rev = "v${version}"; - sha256 = "sha256-c+9DEMxioIbEDNTdLSOnxX1zpFk07K9rlGP9goEJMlU="; + sha256 = "sha256-zvSSCNtqHOZVlrBggjgxEyUTqTiAIAhdzUkm4Pm9b3k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix index 79a9fdb51c..6d0d71e867 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A codeplug programming tool for DMR radios"; + description = "GUI application and command line tool for programming DMR radios"; homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ janik _0x4A6F ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index fa3f566b3f..abba5c6204 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.6"; + version = "7.9.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4="; + sha256 = "sha256-lX49R1GhYH45DhxOnn3r6b4VuG8GAissCscv1Qo2GB0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index adf997773e..59a1e0f59a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -5,7 +5,8 @@ , python ? null , ncurses, swig2 , extraPackages ? [] -} : +, testers +}: let @@ -14,7 +15,7 @@ let modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; inherit version; @@ -58,12 +59,15 @@ in stdenv.mkDerivation { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; mainProgram = "SoapySDRUtil"; + pkgConfigModules = [ "SoapySDR" ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index d74ad2c4e8..3769948fd3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-WWbtfqvGd13+a41z8/MjlchllpuhLX08nu15OlYUeuI="; + sha256 = "sha256-sve9q4iM/Y8+K64Ceby/KGx5Un5G0o5cCnIxJkXTgug="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix index f6d767235b..ec97f0e6aa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.15.5"; + version = "2.16.0"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-AKKMtR0hU2O84mRJxxsXNCYHeW8d6t3XJpzOKKaxAWw="; + sha256 = "sha256-pfFUtPgHzTWMm3sh4un8SwSYF8HM30HbAQznxlu4Irw="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix index 5fcb367ce5..04ef7c2e06 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.60"; + version = "2.62"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-ppKG7Z1TyLwUyqRnGYk3QWPJqKeNcW04GMW7myPFSNM="; + sha256 = "sha256-7uhQVLC/AEPAPUdm3+vABoIwG4uhNy/EngjsrZjT0Ts="; }; buildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix index 8b9b086b77..2c0cad0559 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "varscan"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "https://github.com/dkoboldt/varscan/raw/master/VarScan.v${version}.jar"; - sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0="; + sha256 = "sha256-q4jkkKTqXHiaAPRThqo82i43+B4NaHUUuMyefW6tgg0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix new file mode 100644 index 0000000000..d2b2b558bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, gfortran +, fetchFromGitHub +, cmake +, blas +, lapack +, python3Packages +}: + +assert blas.isILP64 == lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "mopac"; + version = "22.0.6"; + + src = fetchFromGitHub { + owner = "openmopac"; + repo = pname; + rev = "v${version}"; + hash = "sha256-j4AP3tki+Ep9Pv+pDg8TwCiJvpF2j5npW3Kpat+7gGg="; + }; + + nativeBuildInputs = [ gfortran cmake ]; + + buildInputs = [ blas lapack ]; + + checkInputs = with python3Packages; [ python numpy ]; + + doCheck = true; + + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + meta = with lib; { + description = "Semiempirical quantum chemistry"; + homepage = "https://github.com/openmopac/mopac"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix new file mode 100644 index 0000000000..1e76a30595 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix @@ -0,0 +1,194 @@ +{ lib +, stdenv +, pkgs +, fetchFromGitHub +, fetchpatch +, which +, openssh +, gcc +, gfortran +, perl +, mpi +, blas +, lapack +, python3 +, tcsh +, bash +, automake +, autoconf +, libtool +, makeWrapper +}: + +assert blas.isILP64 == lapack.isILP64; + +let + versionGA = "5.7.2"; # Fixed by nwchem + + ga_src = fetchFromGitHub { + owner = "GlobalArrays"; + repo = "ga"; + rev = "v${versionGA}"; + sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i"; + }; + +in +stdenv.mkDerivation rec { + pname = "nwchem"; + version = "7.0.2"; + + src = fetchFromGitHub { + owner = "nwchemgit"; + repo = "nwchem"; + rev = "v${version}-release"; + sha256 = "1ckhcjaw1hzdsmm1x2fva27c4rs3r0h82qivg72v53idz880hbp3"; + }; + + patches = [ + # Fix Python 3.10 compatibility + (fetchpatch { + name = "python3.10"; + url = "https://github.com/nwchemgit/nwchem/commit/638401361c6f294164a4f820ff867a62ac836fd5.patch"; + sha256 = "sha256-yUZb3wWYZm1dX0HwvffksFwhVdb7ix1p8ooJnqiSgEg="; + }) + ]; + + nativeBuildInputs = [ + perl + automake + autoconf + libtool + makeWrapper + gfortran + which + ]; + buildInputs = [ + tcsh + openssh + blas + lapack + python3 + ]; + propagatedBuildInputs = [ mpi ]; + propagatedUserEnvPkgs = [ mpi ]; + + postUnpack = '' + cp -r ${ga_src}/ source/src/tools/ga-${versionGA} + chmod -R u+w source/src/tools/ga-${versionGA} + ''; + + postPatch = '' + find -type f -executable -exec sed -i "s:/bin/csh:${tcsh}/bin/tcsh:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/usr/bin/gcc:${gcc}/bin/gcc:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -executable -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -name "makelib.h" -exec sed -i "s:/bin/rm:rm:" \{} \; + + # Overwrite script, skipping the download + echo -e '#!/bin/sh\n cd ga-${versionGA};autoreconf -ivf' > src/tools/get-tools-github + + patchShebangs ./ + ''; + + # There is no configure script. Instead the build is controlled via + # environment variables passed to the Makefile + configurePhase = '' + runHook preConfigure + + # config parameters + export NWCHEM_TARGET="LINUX64" + + export ARMCI_NETWORK="MPI-PR" + export USE_MPI="y" + export USE_MPIF="y" + + export NWCHEM_MODULES="all python" + + export USE_PYTHONCONFIG="y" + export USE_PYTHON64="n" + export PYTHONLIBTYPE="so" + export PYTHONHOME="${python3}" + export PYTHONVERSION=${lib.versions.majorMinor python3.version} + + export BLASOPT="-L${blas}/lib -lblas" + export LAPACK_LIB="-L${lapack}/lib -llapack" + export BLAS_SIZE=${if blas.isILP64 then "8" else "4"} + + # extra TCE related options + export MRCC_METHODS="y" + export EACCSD="y" + export IPCCSD="y" + + export NWCHEM_TOP="$(pwd)" + + runHook postConfigure + ''; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${ga_src} src/tools/ga-${versionGA}.tar.gz + cd src + make nwchem_config + ${lib.optionalString (!blas.isILP64) "make 64_to_32"} + ''; + + postBuild = '' + cd $NWCHEM_TOP/src/util + make version + make + cd $NWCHEM_TOP/src + make link + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/nwchem + + cp $NWCHEM_TOP/bin/LINUX64/nwchem $out/bin/nwchem + cp -r $NWCHEM_TOP/src/data $out/share/nwchem/ + cp -r $NWCHEM_TOP/src/basis/libraries $out/share/nwchem/data + cp -r $NWCHEM_TOP/src/nwpw/libraryps $out/share/nwchem/data + cp -r $NWCHEM_TOP/QA $out/share/nwchem + + wrapProgram $out/bin/nwchem \ + --set-default NWCHEM_BASIS_LIBRARY $out/share/nwchem/data/libraries/ + + cat > $out/share/nwchem/nwchemrc << EOF + nwchem_basis_library $out/share/nwchem/data/libraries/ + nwchem_nwpw_library $out/share/nwchem//data/libraryps/ + ffield amber + amber_1 $out/share/nwchem/data/amber_s/ + amber_2 $out/share/nwchem/data/amber_q/ + amber_3 $out/share/nwchem/data/amber_x/ + amber_4 $out/share/nwchem/data/amber_u/ + spce $out/share/nwchem/data/solvents/spce.rst + charmm_s $out/share/nwchem/data/charmm_s/ + charmm_x $out/share/nwchem/data/charmm_x/ + EOF + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + export OMP_NUM_THREADS=1 + + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + export OMPI_MCA_rmaps_base_oversubscribe=1 + + # run a simple water test + mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out + grep "Total SCF energy" h2o.out | grep 76.010538 + ''; + + passthru = { inherit mpi; }; + + meta = with lib; { + description = "Open Source High-Performance Computational Chemistry"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + homepage = "https://nwchemgit.github.io"; + license = licenses.ecl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix new file mode 100644 index 0000000000..455588ee17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +, wxGTK32 +, libGL +, libGLU +, pkg-config +, xorg +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "wxmacmolplt"; + version = "7.7.2"; + + src = fetchFromGitHub { + owner = "brettbode"; + repo = pname; + rev = "v${version}"; + hash = "sha256-sNxCjIEJUrDWtcUqBQqvanNfgNQ7T4cabYy+x9D1U+Q="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ + wxGTK32 + libGL + libGLU + xorg.libX11 + xorg.libX11.dev + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Graphical user inteface for GAMESS-US"; + homepage = "https://brettbode.github.io/wxmacmolplt/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix index b02082e5b6..2e882aff36 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -5,7 +5,7 @@ , csxcad , qcsxcad , hdf5 -, vtk_8_withQt5 +, vtkWithQt5 , qtbase , fparser , tinyxml @@ -15,13 +15,13 @@ mkDerivation { pname = "appcsxcad"; - version = "unstable-2020-01-04"; + version = "unstable-2023-01-06"; src = fetchFromGitHub { owner = "thliebig"; repo = "AppCSXCAD"; - rev = "de8c271ec8b57e80233cb2a432e3d7fd54d30876"; - sha256 = "0shnfa0if3w588a68gr82qi6k7ldg1j2921fnzji90mmay21birp"; + rev = "379ede4b8e00c11e8d0fb724c35547991b30c423"; + hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ mkDerivation { csxcad qcsxcad hdf5 - vtk_8_withQt5 + vtkWithQt5 qtbase fparser tinyxml diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix index 10bae3c0fd..f6b0ff93ff 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix @@ -5,7 +5,7 @@ , tinyxml , hdf5 , cgal_5 -, vtk_8 +, vtk , boost , gmp , mpfr @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "csxcad"; - version = "unstable-2020-02-08"; + version = "unstable-2022-05-18"; src = fetchFromGitHub { owner = "thliebig"; repo = "CSXCAD"; - rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; - sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; + rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1"; + sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn"; }; patches = [./searchPath.patch ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { boost gmp mpfr - vtk_8 + vtk fparser tinyxml hdf5 diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix index 0515809dff..72b931f1d1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix @@ -4,8 +4,8 @@ let pkgDescription = "A digital logic designer and circuit simulator."; - version = "0.29"; - buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + version = "0.30"; + buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; @@ -24,7 +24,8 @@ let # inspect the .git folder to find the version number we are building, we then # provide that version number manually as a property. # (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481) - mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}"; + # Also use the commit date as a build and output timestamp. + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in stdenv.mkDerivation rec { pname = "digital"; @@ -33,20 +34,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hneemann"; repo = "Digital"; - rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; - sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6"; + sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM="; }; - # Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to - # a version where they support reproducible builds - patches = [ ./pom.xml.patch ]; - # Fetching maven dependencies from "central" needs the network at build phase, # we do that in this extra derivation that explicitely specifies its # outputHash to ensure determinism. mavenDeps = stdenv.mkDerivation { name = "${pname}-${version}-maven-deps"; - inherit src nativeBuildInputs version patches postPatch; + inherit src nativeBuildInputs version; dontFixup = true; buildPhase = '' mvn package ${mvnOptions} -Dmaven.repo.local=$out @@ -62,15 +59,11 @@ stdenv.mkDerivation rec { ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE="; }; nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; - postPatch = '' - substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" - ''; - buildPhase = '' mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/pom.xml.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/pom.xml.patch deleted file mode 100644 index cdc5a777c4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/pom.xml.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index d5f8330b4..58ed18b63 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -129,7 +130,7 @@ - - org.apache.maven.plugins - maven-jar-plugin -- 2.5 -+ 3.2.0 - - - -@@ -188,6 +189,7 @@ - - org.apache.maven.plugins - maven-assembly-plugin -+ 3.2.0 - - Digital - false -@@ -202,7 +204,7 @@ - - - ${git.commit.id.describe} -- ${maven.build.timestamp} -+ @buildDate@ - icons/splash.png - - diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix index d4aa6e6dfc..9fd9d56295 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix @@ -9,8 +9,12 @@ , fontconfig , gtk3 , wrapGAppsHook +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "openboardview"; version = "9.0.3"; @@ -24,11 +28,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ]; - buildInputs = [ SDL2 fontconfig gtk3 ]; + buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; postPatch = '' substituteInPlace src/openboardview/CMakeLists.txt \ --replace "SDL2::SDL2main" "" + substituteInPlace CMakeLists.txt --replace "fixup_bundle" "#fixup_bundle" ''; cmakeFlags = [ @@ -37,9 +44,12 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - postFixup = '' - wrapGApp "$out/bin/${pname}" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} + postFixup = lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app" + '' + lib.optionalString (!stdenv.isDarwin) '' + wrapGApp "$out/bin/${pname}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} ''; passthru.updateScript = gitUpdater { @@ -50,7 +60,7 @@ stdenv.mkDerivation rec { description = "Linux SDL/ImGui edition software for viewing .brd files"; homepage = "https://github.com/OpenBoardView/OpenBoardView"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ k3a ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix index 53768588c3..083f01a428 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix @@ -5,7 +5,7 @@ , fparser , tinyxml , hdf5 -, vtk_8 +, vtk , boost , zlib , cmake @@ -39,7 +39,7 @@ stdenv.mkDerivation { fparser tinyxml hdf5 - vtk_8 + vtk boost zlib csxcad diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 33d145c007..e77f6aeeb2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub , perl, flex, bison, python3, autoconf -, which, cmake +, which, cmake, help2man }: stdenv.mkDerivation rec { pname = "verilator"; - version = "5.002"; + version = "5.006"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-RNoKAEF7zl+WqqbxGP/VvdQqQP8VI3hoQku3b/g0XpU="; + hash = "sha256-PA8hbE6XECapuaO5YcgEodOoxSDqpMucdijJBBb7fZg="; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison python3 autoconf ]; + nativeBuildInputs = [ flex bison python3 autoconf help2man ]; nativeCheckInputs = [ which ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... @@ -24,14 +24,8 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; - preCheck = '' - patchShebangs \ - src/flexfix \ - src/vlcovgen \ - bin/verilator \ - bin/verilator_coverage \ - test_regress/driver.pl \ - test_regress/t/*.pl + postPatch = '' + patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix index 3d752b7d7b..1d0c72359c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc="; }; - buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); + strictDeps = true; + + nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix index d4f0ac3e50..c627b8a3c8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix @@ -13,11 +13,19 @@ stdenv.mkDerivation { sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E="; }; - buildInputs = [ dune_2 ] ++ (with ocamlPackages; [ - ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson - ]); + strictDeps = true; - buildPhase = "dune build --profile=release"; + nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ]; + + buildInputs = with ocamlPackages; [ + ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson + ]; + + buildPhase = '' + runHook preBuild + dune build --profile=release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; installPhase = '' dune install --prefix $out --libdir $OCAMLFIND_DESTDIR diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix index 4009761e8d..ba5719012e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.74.0"; + version = "5.76.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow="; + sha256 = "sha256-OVOoAfoqev33c7pIzBGK9HD+zgji/+BWKD33RYJaSDc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 8a40216c3e..10d77885b5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -91,7 +91,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; inherit ocamlPackages ocamlNativeBuildInputs; - inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; + inherit ocamlPropagatedBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix index 195dd98aa3..f056b3e433 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs="; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; /* Fix up the frontend to load the 'default' cryptoverif library ** from under $out/libexec. By default, it expects to find the files diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix index d6d9bb11a9..187cbc9a92 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix @@ -9,10 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM="; }; - buildInputs = [ - ocaml - perl - ]; + strictDeps = true; + nativeBuildInputs = [ ocaml perl ]; setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; preInstall = "export INSTALLDIR=$out"; postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix index e66fe992e1..4c105a40e2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix @@ -38,7 +38,9 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ ocaml camlp5 ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/iprover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/iprover/default.nix index ff88586e03..6485681e33 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/iprover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/iprover/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8"; }; - buildInputs = [ ocaml eprover zlib ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml eprover ]; + buildInputs = [ zlib ]; preConfigure = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix index cbc85c5544..4087763aa0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ eprover ocaml camlp4 perl zlib ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper eprover ocaml camlp4 perl ]; + buildInputs = [ zlib ]; patches = [ (fetchpatch { url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix index bbc96b2b68..a00c565fb4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE="; }; - nativeBuildInputs = [ pkg-config opaline ]; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ]; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config opaline ] ++ (with ocamlPackages; [ findlib ocaml ]); + buildInputs = with ocamlPackages; [ ocamlgraph ]; installTargets = "ott.install"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix index 2606b94f4b..4e65c018d1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ - ocaml findlib camlp5 lablgtk ]); + strictDeps = true; + + nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]); + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]); dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index b6d15162fe..57220aa523 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; buildPhase = "./build -nointeract"; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix index 648ebee655..5e5fe99253 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix @@ -3,8 +3,11 @@ stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml zlib which eprover coq ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml which eprover coq ]; + buildInputs = [ zlib ]; + src = fetchurl { url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/statverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/statverif/default.nix index 07365eef33..1f62389775 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/statverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/statverif/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw"; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; patchPhase = "patch -p1 < ${pf-patch}"; buildPhase = "./build"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix index 14b3055ab3..59afbc094e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca"; }; - buildInputs = [ ocaml isabelle cvc3 perl wget which ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml isabelle cvc3 perl wget which ]; installPhase = '' mkdir -pv "$out" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix index 8ca2a6baa8..55b59ff2e3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -10,8 +10,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; }; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ + ocaml findlib menhir + # Coq Support + coqPackages.coq + ]; + buildInputs = with ocamlPackages; [ - ocaml findlib ocamlgraph zarith menhir + ocamlgraph zarith # Emacs compilation of why3.el emacs # Documentation diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index 75cfa2568f..928c0b6abe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -29,12 +29,15 @@ let common = { version, sha256, patches ? [ ] }: sha256 = sha256; }; - nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ python ] + strictDeps = true; + + nativeBuildInputs = [ python ] + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib zarith ] + ++ optionals ocamlBindings [ ocaml findlib ] ; - propagatedBuildInputs = [ python.pkgs.setuptools ]; + propagatedBuildInputs = [ python.pkgs.setuptools ] + ++ optionals ocamlBindings [ zarith ]; enableParallelBuilding = true; postPatch = optionalString ocamlBindings '' diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1644ca3d14..6b76eea33c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfrontier"; - version = "0.9.4"; + version = "unstable-2022-01-06"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; - rev = version; - sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n"; + rev = "2461fb1dde13b73039926aa66606e470907a1b59"; + sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoSha256 = "0lhcazcih48gc23q484h344bzz7p3lh189ljhswdyph2i11caarp"; + cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix index fe68d9d245..4fccc3a464 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "An open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs"; homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix index 91cf4ae4f3..4c0032e6c8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix @@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { urls = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0="; + hash = "sha256-sEYoER7iKHZRmksc2vsy/rqjTq+iT56B9Y+NBX++4N0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix index 0eecff0a17..4dc11db532 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.8"; + version = "4.9"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-GfsAypJBpHwpvoEl/IzJ1gQfeMcYwB7oNe01xWJ+86w="; + sha256 = "sha256-BMkLgms6JsWmPhi+MZv/Eqie8BKL+KaPtk3xBZSyWfM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix index 665a2924af..8ac8adcbf5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20230127121939"; + version = "3.1.20230201130431"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pEow2vEpQ2+c3fXkB8q7R4pud1xLzE74+HEqcBzg0D8="; + hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix index 031f1655b0..fde756181c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: +{ lib +, boost +, breakpad +, ceres-solver +, cgal +, cmake +, eigen +, fetchFromGitHub +, glfw +, gmp +, libjpeg +, libpng +, libtiff +, mpfr +, opencv +, openmp +, pkg-config +, stdenv +, vcg +, zstd +}: let boostWithZstd = boost.overrideAttrs (old: { @@ -20,10 +40,38 @@ stdenv.mkDerivation rec { # SSE is enabled by default cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; - buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; + buildInputs = [ + boostWithZstd + breakpad + ceres-solver + cgal + eigen + glfw + gmp + libjpeg + libpng + libtiff + mpfr + opencv + openmp + vcg + ]; nativeBuildInputs = [ cmake pkg-config ]; + postInstall = '' + mv $out/bin/OpenMVS/* $out/bin + rmdir $out/bin/OpenMVS + rm $out/bin/Tests + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + ctest + runHook postCheck + ''; + meta = { description = "Open Multi-View Stereo reconstruction library"; homepage = "https://github.com/cdcseacave/openMVS"; diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5093a586a8..26e6ab12ab 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2022.4"; + version = "2023"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-xRG+YC/ylAIGW1CQaEHe+YdSY5uSqV8bChBg2bXicpc="; + sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix index 85ee654a98..95c4f0f715 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,72 +1,50 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , gnome , libgtop -, gtk3 -, libhandy +, gtk4 +, libadwaita , pcre2 -, vte -, appstream-glib +, vte-gtk4 , desktop-file-utils -, git , meson , ninja , pkg-config -, python3 -, sassc -, wrapGAppsHook +, wrapGAppsHook4 , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-console"; - # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! - version = "42.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; + sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4="; }; - patches = [ - (fetchpatch { - name = "fix-clang-build-issues.patch"; - url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; - sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; - }) - ]; - - buildInputs = [ - gettext - libgtop - gtk3 - libhandy - pcre2 - vte - ]; - nativeBuildInputs = [ - appstream-glib desktop-file-utils - git + gettext meson ninja pkg-config - python3 - sassc - wrapGAppsHook + wrapGAppsHook4 ]; - mesonFlags = [ - "-Dnautilus=disabled" + buildInputs = [ + libgtop + gtk4 + libadwaita + pcre2 + vte-gtk4 ]; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-console"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index aad2c367b9..07980f8375 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland @@ -21,20 +21,23 @@ , zsh , fish , nixosTests +, go +, buildGoModule }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.26.5"; + version = "0.27.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4="; + hash = "sha256-/K/5T15kULTQP1FCLnyrKfhlQjIStayutaxLjmHjHes="; }; + vendorHash = "sha256-JLPPNOsoq+ErLhELsX3z3YehYfgp7OGXEXlP3IVcM5k="; buildInputs = [ harfbuzz @@ -67,21 +70,15 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs + go ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. ]; - outputs = [ "out" "terminfo" "shell_integration" ]; + outputs = [ "out" "terminfo" "shell_integration" "kitten" ]; patches = [ - # Fix clone-in-kitty not working on bash >= 5.2 - # TODO: Removed on kitty release > 0.26.5 - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch"; - sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4="; - }) - # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. ./fix-test_ssh_env_vars.patch @@ -99,7 +96,20 @@ buildPythonApplication rec { # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - dontConfigure = true; + CGO_ENABLED = 0; + GOFLAGS = "-trimpath"; + + configurePhase = let + goModules = (buildGoModule { + pname = "kitty-go-modules"; + inherit src vendorHash version; + }).go-modules; + in '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOPROXY=off + cp -r --reflink=auto ${goModules} vendor + ''; buildPhase = let commonOptions = '' @@ -114,17 +124,17 @@ buildPythonApplication rec { runHook preBuild ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' - ${python.interpreter} setup.py build ${darwinOptions} + ${python.pythonForBuild.interpreter} setup.py build ${darwinOptions} make docs - ${python.interpreter} setup.py kitty.app ${darwinOptions} + ${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions} '' else '' - ${python.interpreter} setup.py build-launcher - ${python.interpreter} setup.py linux-package \ + ${python.pythonForBuild.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} + ${python.pythonForBuild.interpreter} setup.py build-launcher ''} runHook postBuild ''; @@ -169,15 +179,19 @@ buildPythonApplication rec { installPhase = '' runHook preInstall 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" + ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" + cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten" mkdir "$out/Applications" cp -r kitty.app "$out/Applications/kitty.app" installManPage 'docs/_build/man/kitty.1' '' else '' 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 ]}" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix index 91b3b0cd9c..65eee3d93b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix @@ -1,26 +1,32 @@ -{ lib -, stdenv +{ bash , buildGoModule +, common-updater-scripts +, coreutils +, curl , fetchurl -, makeWrapper , git -, bash -, openssh , gzip +, jq +, lib +, makeWrapper +, nix +, openssh , pam , pamSupport ? true , sqliteSupport ? true +, stdenv +, writeShellApplication }: buildGoModule rec { pname = "forgejo"; - version = "1.18.2-1"; + version = "1.18.3-0"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/44ff6fcb-1515-4bba-85bf-3d3795ced2f7"; - hash = "sha256-XSh17AwPtC+Y24lgjjXJzT/uBHg+0hWZ2RZ/eNF4mCY="; + url = "https://codeberg.org/attachments/384fd9ab-7c64-4c29-9b1b-cdb803c48103"; + hash = "sha256-zBGd+wPJDw7bwRvAlscqbQHDG6po3dlbpYccfanbtyU="; }; vendorHash = null; @@ -59,12 +65,52 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; + passthru.updateScript = lib.getExe (writeShellApplication { + name = "update-forgejo"; + runtimeInputs = [ + common-updater-scripts + coreutils + curl + jq + nix + ]; + text = '' + releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \ + --silent \ + --header "accept: application/json") + + stable=$(jq '.[0] + | .tag_name[1:] as $version + | ("forgejo-src-\($version).tar.gz") as $filename + | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ + <<< "$releases") + + archive_url=$(jq -r .gz <<< "$stable") + checksum_url=$(jq -r .sha256 <<< "$stable") + release_url=$(jq -r .html_url <<< "$stable") + version=$(jq -r .version <<< "$stable") + + if [[ "${version}" = "$version" ]]; then + echo "No new version found (already at $version)" + exit 0 + fi + + echo "Release: $release_url" + + sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) + sri_hash=$(nix hash to-sri --type sha256 "$sha256") + + update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + ''; + }); + meta = with lib; { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ indeednotjames urandom ]; broken = stdenv.isDarwin; + mainProgram = "gitea"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix index dcce6f7f3c..92e8d9095b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix @@ -12,7 +12,7 @@ let pname = "gfold"; - version = "4.2.0"; + version = "4.3.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-cH4FhXrdT0ejpyt8G2rSGw9WE9sfOXRkSA9+FVwRmtQ="; + sha256 = "sha256-yvMp5x1uiJGkWHnwfONx4pVotSSE6sTW4uqWpI2AFXg="; }; - cargoSha256 = "sha256-NmVmqBzRUdumWQ9MzolZTo0VQW9JTjIyYRwUTzGiQZ4="; + cargoHash = "sha256-MBWaNjs840twU9SQLvgVcXTT0RN2QJ7PiaAohiiQu3s="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index 9018635ad9..3f154f0350 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-TREy2pzVAHClwbryfEgX2WqtQ8+RmJtCNrESeaHDHMs="; + hash = "sha256-91TmPIjFOCeZmbobn3mIJis5qofJFmNGuX19+Cyo8Ck="; }; - vendorHash = "sha256-OjTl43UQGGHqCrw0kMBShuS8aonjWczfzQGmGJLhdrU="; + vendorHash = "sha256-NiXC0ooUkAqFCLp3eRBpryazQU94gSnw0gYFwQNeCo4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index 24fc850b31..9667e7bd2f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.14.3"; + version = "3.15.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; + hash = "sha256-HSgCvHjSOrMPsdOPtgFUeK6b0ioVnwTtg2oHGg4BrZw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-subset/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-subset/default.nix deleted file mode 100644 index 53db1c01ee..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-subset/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "git-subset"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "jasonwhite"; - repo = pname; - rev = "v${version}"; - sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb"; - }; - - cargoSha256 = "0lc9m9prmhr4ipjh95cfczvlmpp9scryksvqd49h4acyr904n7ry"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; - - meta = with lib; { - description = "Super fast Git tree filtering"; - homepage = "https://github.com/jasonwhite/git-subset"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index d2a51c9472..df72a64aaa 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -7,26 +7,27 @@ , libiconv , Security , SystemConfiguration +, curl , openssl }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-GGXujTn5Xb63vKIycj5o9+PCsMN1Kp3RCSg1wiM31qA="; + sha256 = "sha256-8+4AEX4NPflhAB1rZHaz0XPycoL5T3z20ZKlNRdUEdw="; }; - cargoSha256 = "sha256-MAZhrd9CtFOIAaUUbXplBo+eo6Zaws2LIRkPoX4HztE="; + cargoSha256 = "sha256-ybsrrJFH4xKcxRQCI+ypfp5biCrlIidAog01SFCx1ms="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = [ curl ] ++ (if stdenv.isDarwin then [ libiconv Security SystemConfiguration ] - else [ openssl ]; + else [ openssl ]); # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix index 9d6bbbd13f..a789a35f7a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.24.1"; + version = "1.25.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-CUchYPMBTINkMJg8TC8rKMVkrcj/Gy+ZxV7jbtMFvpg="; + hash = "sha256-x/VH6cRrJZ2t2iftBPC86FcgIwjRNzV11MwLG2y+Paw="; }; - vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; + vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix index 20edc2af50..2e71206aff 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4]; + nativeBuildInputs = [ pkg-config makeWrapper ocaml camlp4 ]; + buildInputs = [ lablgtk libgnomecanvas glib graphviz_2_0 ]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix new file mode 100644 index 0000000000..b49969317e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix @@ -0,0 +1,57 @@ +{ lib +, python3 +, fetchPypi +, pandoc +, git +, scriv +, testers +}: + +python3.pkgs.buildPythonApplication rec { + pname = "scriv"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-u2HDD+pzFYpNGMKLu1eCHDCCRWg++w2Je9ReSnhWtHI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + click + click-log + jinja2 + requests + ] ++ lib.optionals (python3.pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + coverage + freezegun + pudb + pytest-mock + responses + pyyaml + + pandoc + git + ]; + disabledTests = [ + # assumes we have checked out the full repo (including remotes) + "test_real_get_github_repos" + ]; + + passthru.tests = { + version = testers.testVersion { package = scriv; }; + }; + + meta = { + description = "Command-line tool for helping developers maintain useful changelogs."; + homepage = "https://github.com/nedbat/scriv"; + changelog = "https://github.com/nedbat/scriv/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix index 7faca39e2f..9c9f6f4033 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix @@ -2,6 +2,7 @@ , callPackage , recurseIntoAttrs , nixosTests +, config }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -28,12 +29,10 @@ let }; }; in -with python.pkgs; recurseIntoAttrs { +with python.pkgs; recurseIntoAttrs ({ inherit python; coresrht = toPythonApplication srht; buildsrht = toPythonApplication buildsrht; - # Added 2022-10-29 - dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; gitsrht = toPythonApplication gitsrht; hgsrht = toPythonApplication hgsrht; hubsrht = toPythonApplication hubsrht; @@ -46,4 +45,7 @@ with python.pkgs; recurseIntoAttrs { passthru.tests = { nixos-sourcehut = nixosTests.sourcehut; }; -} +} // lib.optionalAttrs config.allowAliases { + # Added 2022-10-29 + dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; +}) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix index cfce8a35f9..ada5f9fea6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.7"; + version = "2.5.8"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-D5NQaxkGhwyBoScI7fZxnSHC0ABmsUeRf8pZCKooV3w="; + sha256 = "sha256-VuuqR5fj0YvqIfVPH7N3rpAfIbcTwOx9W3H60saCToQ="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index 7c06f6ddb8..bd15099b26 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -25,7 +25,7 @@ , numactl , writeText # Processing, video codecs, containers -, ffmpeg-full +, ffmpeg_5-full , nv-codec-headers , libogg , x264 @@ -34,6 +34,7 @@ , libtheora , dav1d , zimg +, svt-av1 # Codecs, audio , libopus , lame @@ -84,57 +85,55 @@ }: let - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy"; + sha256 = "sha256-0MJ1inMNA6s8l2S0wnpM2c7FxOoOHxs9u4E/rgKfjJo="; }; # Handbrake maintains a set of ffmpeg patches. In particular, these # patches are required for subtitle timing to work correctly. See: # https://github.com/HandBrake/HandBrake/issues/4029 - ffmpeg-version = "4.4.1"; - ffmpeg-hb = ffmpeg-full.overrideAttrs (old: { + ffmpeg-version = "5.1.1"; + ffmpeg-hb = ffmpeg_5-full.overrideAttrs (old: { version = ffmpeg-version; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; - hash = "sha256-j8nyCsXtlRFanihWR63Q7t1cwamKA5raFMEyRS+YrEI="; + hash = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs="; }; - patches = old.patches or [] ++ [ - "${src}/contrib/ffmpeg/A01-qsv-scale-fix-green-stripes.patch" - "${src}/contrib/ffmpeg/A02-qsv-interpolation.patch" - "${src}/contrib/ffmpeg/A03-qsv-dx11-ffmpeg44.patch" - "${src}/contrib/ffmpeg/A04-configure-ensure-the-right-libmfx-version-is-used-wh.patch" - "${src}/contrib/ffmpeg/A05-qsv-add-includedir-mfx-to-the-search-path-for-old-ve.patch" - "${src}/contrib/ffmpeg/A06-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A07-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A08-qsvenc-don-t-support-multi-frame-encode-when-MFX_VER.patch" - "${src}/contrib/ffmpeg/A09-qsvenc-don-t-support-MFX_RATECONTROL_LA_EXT-when-MFX.patch" - "${src}/contrib/ffmpeg/A10-qsv-don-t-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A11-qsv-opaque-deinterlace.patch" - "${src}/contrib/ffmpeg/A12-qsv-opaque-vpp.patch" - "${src}/contrib/ffmpeg/A13-qsv-opaque-hwcontext_qsv.patch" - "${src}/contrib/ffmpeg/A14-configure-check-mfxdefs.h-instead-of-mfxvp9.h-for-MF.patch" - "${src}/contrib/ffmpeg/A15-configure-allow-user-to-build-FFmpeg-against-oneVPL.patch" - "${src}/contrib/ffmpeg/A16-qsv-add-macro-QSV_ONEVPL-for-the-oneVPL-SDK.patch" - "${src}/contrib/ffmpeg/A17-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" - "${src}/contrib/ffmpeg/A18-qsv-new-method-hwcontext_qsv.patch" - "${src}/contrib/ffmpeg/A19-qsv-fix-session-for-d3d11-device.patch" - "${src}/contrib/ffmpeg/A20-mov-read-name-track-tag-written-by-movenc.patch" - "${src}/contrib/ffmpeg/A21-movenc-write-3gpp-track-titl-tag.patch" - "${src}/contrib/ffmpeg/A22-mov-read-3gpp-udta-tags.patch" - "${src}/contrib/ffmpeg/A23-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A24-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A25-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A26-ccaption_dec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A27-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A28-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A29-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A30-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A32-qsv-fix-decode-10bit-hdr.patch" + patches = old.patches or [ ] ++ [ + "${src}/contrib/ffmpeg/A01-qsv-libavfilter-qsvvpp-change-the-output-frame-s-width-a.patch" + "${src}/contrib/ffmpeg/A02-qsv-configure-ensure-enable-libmfx-uses-libmfx-1.x.patch" + "${src}/contrib/ffmpeg/A03-qsv-configure-fix-the-check-for-MFX_CODEC_VP9.patch" + "${src}/contrib/ffmpeg/A04-qsv-remove-mfx-prefix-from-mfx-headers.patch" + "${src}/contrib/ffmpeg/A05-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A06-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A07-qsvenc-support-multi-frame-encode-when-MFX_VERSION-2.patch" + "${src}/contrib/ffmpeg/A08-qsvenc-support-MFX_RATECONTROL_LA_EXT-when-MFX_VERSI.patch" + "${src}/contrib/ffmpeg/A09-qsv-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A10-qsv-configure-add-enable-libvpl-option.patch" + "${src}/contrib/ffmpeg/A11-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" + "${src}/contrib/ffmpeg/A12-qsv-fix-decode-10bit-hdr.patch" + "${src}/contrib/ffmpeg/A13-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A14-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A15-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A16-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A17-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A18-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A19-ccaption_dec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A20-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A21-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A22-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A23-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A24-fix-eac3-dowmix.patch" + "${src}/contrib/ffmpeg/A25-enable-truehd-pass.patch" + "${src}/contrib/ffmpeg/A26-Update-the-min-version-to-1.4.23.0-for-AMF-SDK.patch" + "${src}/contrib/ffmpeg/A27-avcodec-amfenc-Fixes-the-color-information-in-the-ou.patch" + "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch" + "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch" ]; }); @@ -151,148 +150,151 @@ let inherit (lib) optional optionals optionalString versions; in -let self = stdenv.mkDerivation rec { - pname = "handbrake"; - inherit version src; +let + self = stdenv.mkDerivation rec { + pname = "handbrake"; + inherit version src; - postPatch = '' - install -Dm444 ${versionFile} ${versionFile.name} + postPatch = '' + install -Dm444 ${versionFile} ${versionFile.name} - patchShebangs scripts + patchShebangs scripts - substituteInPlace libhb/hb.c \ - --replace 'return hb_version;' 'return "${version}";' + substituteInPlace libhb/hb.c \ + --replace 'return hb_version;' 'return "${version}";' - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - '' + optionalString stdenv.isDarwin '' - # Use the Nix-provided libxml2 instead of the patched version available on - # the Handbrake website. - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py + '' + optionalString stdenv.isDarwin '' + # Use the Nix-provided libxml2 instead of the patched version available on + # the Handbrake website. + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 - # Prevent the configure script from failing if xcodebuild isn't available, - # which it isn't in the Nix context. (The actual build goes fine without - # xcodebuild.) - sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py - '' + optionalString stdenv.isLinux '' - # Use the Nix-provided libxml2 instead of the system-provided one. - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - ''; - - nativeBuildInputs = [ - autoconf - automake - libtool - m4 - pkg-config - python3 - ] - ++ optionals useGtk [ intltool wrapGAppsHook ]; - - buildInputs = [ - a52dec - dav1d - ffmpeg-hb - fontconfig - freetype - fribidi - harfbuzz - jansson - lame - libass - libbluray - libdvdcss - libdvdnav - libdvdread - libiconv - libjpeg_turbo - libogg - libopus - libsamplerate - libtheora - libvorbis - libvpx - libxml2 - speex - x264 - x265 - xz - zimg - ] - ++ optional (!stdenv.isDarwin) numactl - ++ optionals useGtk [ - dbus-glib - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk3 - hicolor-icon-theme - libappindicator-gtk3 - libgudev - libnotify - udev - ] - ++ optional useFdk fdk_aac - ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] - # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, - # look at ./make/configure.py search "enable_nvenc" - ++ optional stdenv.isLinux nv-codec-headers; - - configureFlags = [ - "--disable-df-fetch" - "--disable-df-verify" - "--disable-gtk-update-checks" - ] - ++ optional (!useGtk) "--disable-gtk" - ++ optional useFdk "--enable-fdk-aac" - ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional stdenv.hostPlatform.isx86 "--harden"; - - # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ "-lx265" ]; - - makeFlags = [ "--directory=build" ]; - - passthru.tests = { - basic-conversion = - let - # Big Buck Bunny example, licensed under CC Attribution 3.0. - testMkv = fetchurl { - url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; - sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; - }; - in - runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' - mkdir -p $out - cd $out - HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 - test -e test.mp4 - HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 - test -e test.mkv - ''; - version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; - }; - - meta = with lib; { - homepage = "https://handbrake.fr/"; - description = "A tool for converting video files and ripping DVDs"; - longDescription = '' - Tool for converting and remuxing video files - into selection of modern and widely supported codecs - and containers. Very versatile and customizable. - Package provides: - CLI - `HandbrakeCLI` - GTK GUI - `ghb` + # Prevent the configure script from failing if xcodebuild isn't available, + # which it isn't in the Nix context. (The actual build goes fine without + # xcodebuild.) + sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py + '' + optionalString stdenv.isLinux '' + # Use the Nix-provided libxml2 instead of the system-provided one. + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Anton-Latukha wmertens ]; - platforms = with platforms; unix; - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + + nativeBuildInputs = [ + autoconf + automake + libtool + m4 + pkg-config + python3 + ] + ++ optionals useGtk [ intltool wrapGAppsHook ]; + + buildInputs = [ + a52dec + dav1d + ffmpeg-hb + fontconfig + freetype + fribidi + harfbuzz + jansson + lame + libass + libbluray + libdvdcss + libdvdnav + libdvdread + libiconv + libjpeg_turbo + libogg + libopus + libsamplerate + libtheora + libvorbis + libvpx + libxml2 + speex + svt-av1 + x264 + x265 + xz + zimg + ] + ++ optional (!stdenv.isDarwin) numactl + ++ optionals useGtk [ + dbus-glib + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + hicolor-icon-theme + libappindicator-gtk3 + libgudev + libnotify + udev + ] + ++ optional useFdk fdk_aac + ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] + # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, + # look at ./make/configure.py search "enable_nvenc" + ++ optional stdenv.isLinux nv-codec-headers; + + configureFlags = [ + "--disable-df-fetch" + "--disable-df-verify" + "--disable-gtk-update-checks" + ] + ++ optional (!useGtk) "--disable-gtk" + ++ optional useFdk "--enable-fdk-aac" + ++ optional stdenv.isDarwin "--disable-xcode" + ++ optional stdenv.hostPlatform.isx86 "--harden"; + + # NOTE: 2018-12-27: Check NixOS HandBrake test if changing + NIX_LDFLAGS = [ "-lx265" ]; + + makeFlags = [ "--directory=build" ]; + + passthru.tests = { + basic-conversion = + let + # Big Buck Bunny example, licensed under CC Attribution 3.0. + testMkv = fetchurl { + url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; + sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; + }; + in + runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' + mkdir -p $out + cd $out + HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 + test -e test.mp4 + HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 + test -e test.mkv + ''; + version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; + }; + + meta = with lib; { + homepage = "https://handbrake.fr/"; + description = "A tool for converting video files and ripping DVDs"; + longDescription = '' + Tool for converting and remuxing video files + into selection of modern and widely supported codecs + and containers. Very versatile and customizable. + Package provides: + CLI - `HandbrakeCLI` + GTK GUI - `ghb` + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ Anton-Latukha wmertens ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + }; }; -}; -in self +in +self diff --git a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix b/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix index 32f4267d9f..58516191fa 100644 --- a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20210224"; + version = "20221031"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; - sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8="; + sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix index d083f1eda2..110c48c1e4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.2"; + version = "1.17.3"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "sha256-gACMzJ7oZCk/INSeJaV7GnF9hy/6F9d0QDLp5jPiF4k="; + sha256 = "1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "sha256-qD+Kuz8j3vDch4PlNQYqdbffL3YSKRqKg6IfkLk/LaQ="; + sha256 = "16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb"; }; in mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 7a8e193250..499f07fccd 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-qA4xVVShkp40QHp2HmmRzVxQaBwskRpUNEULKetVMu8="; + hash = "sha256-wrbVuqIe+DY3R+Jp3zCy2Uw3fv5ejYHtRV2Sv+y/n0w="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { gst-vaapi ]; + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-vaapi.so $out/lib/obs-plugins/ + ''; + meta = with lib; { description = "OBS Studio VAAPI support via GStreamer"; homepage = "https://github.com/fzwoch/obs-vaapi"; diff --git a/third_party/nixpkgs/pkgs/applications/video/stremio/default.nix b/third_party/nixpkgs/pkgs/applications/video/stremio/default.nix index 0316318534..f1b469006a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/stremio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/stremio/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/applications} ln -s $out/opt/stremio/stremio $out/bin/stremio mv $out/opt/stremio/smartcode-stremio.desktop $out/share/applications + install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png ln -s ${nodejs}/bin/node $out/opt/stremio/node ln -s $server $out/opt/stremio/server.js ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix index d13cfbd7f1..e49c2a6591 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix @@ -1,12 +1,17 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , lima +, lima-bin , makeWrapper , qemu , testers , colima + # use lima-bin on darwin to support native macOS virtualization + # https://github.com/NixOS/nixpkgs/pull/209171 +, lima-drv ? if stdenv.isDarwin then lima-bin else lima }: buildGoModule rec { @@ -41,7 +46,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima qemu ]} + --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 25b89889b5..16fdd0317d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpZ3hVgnh8gkrSghSvhSZnG9uaN+GTKFGHv+MMcs73Q="; + hash = "sha256-vmZSt0k6h4Zpbf+/Nq19QIkG3Fzjj3K031XnivFDA2s="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index c417794594..6631ff63ea 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.1.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; + sha256 = "sha256-lQHJ5Y+EMhERxOX062QMNPImAX9tjamGYFXYYUmhpys="; }; - cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; + cargoHash = "sha256-z+DQkl/7kX5tLG9igPnEgHi9sJhB4NoutfV2/BV2U6A="; # skip test due FHS dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index f6cc83fde1..0ac55e0bec 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "podman"; - version = "4.3.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY="; + hash = "sha256-Uha5ueOGNmG2f+1I89uFQKA3pSSp1d02FGy86Fc2eWE="; }; patches = [ @@ -32,7 +32,7 @@ buildGoModule rec { ./rm-podman-mac-helper-msg.patch ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 902a50e4ce..d1fe9bcc9b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,16 +1,16 @@ diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index a6907c0df..717d82ff3 100644 +index 4f25b4d26..8a79862fd 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go -@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward - case 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 { -- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") -- fmt.Printf("\n\tsudo %s install\n", helper) -- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) -- } - case machineLocal: - fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") - case claimUnsupported: +@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward + case 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 { +- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") +- fmt.Printf("\n\tsudo %s install\n", helper) +- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) +- } + case machineLocal: + fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") + case claimUnsupported: diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix index 604000434b..6481836547 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bBFy8yyEbMlVyJYOlWdffIlnZyVdRLPGebTN6bZmnBI="; + sha256 = "sha256-V/4atbYG3jP0o1Bfn/dZBDXEk+Yi4cSJAY8HnTmpHRI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-DV/XJgWRPK+7q7EVltiNRcRGjS9fvHrDKw+w3wNYitQ="; + sha256 = "sha256-gJZ3z6xDgWwOPjCLZg3LRMk3KoTXGaotXgO/xDUwAvk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix new file mode 100644 index 0000000000..b952b0f189 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, lib +, arch +, ocamlPackages +, ocaml +, zlib +, z3 +}: + + +stdenv.mkDerivation rec { + pname = "sail-riscv"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "riscv"; + repo = pname; + rev = version; + hash = "sha256-7PZNNUMaCZEBf0lOCqkquewRgZPooBOjIbGF7JlLnEo="; + }; + + nativeBuildInputs = with ocamlPackages; [ ocamlbuild findlib ocaml z3 sail ]; + buildInputs = with ocamlPackages; [ zlib linksem ]; + strictDeps = true; + + postPatch = '' + rm -r prover_snapshots + ''; + + makeFlags = [ + "SAIL=sail" + "ARCH=${arch}" + "SAIL_DIR=${ocamlPackages.sail}/share/sail" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp c_emulator/riscv_sim_${arch} $out/bin + mkdir $out/share/ + cp -r generated_definitions/{coq,hol4,isabelle} $out/share/ + + runHook postInstall + ''; + + + meta = with lib; { + homepage = "https://github.com/riscv/sail-riscv"; + description = "A formal specification of the RISC-V architecture, written in Sail"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix deleted file mode 100644 index 5ec5b19ce0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, fetchurl -, util-linux -, gpgme -, openssl -, libuuid -, coreutils -, which -, makeWrapper -, cryptsetup -, squashfsTools -, buildGoPackage}: - -with lib; - -buildGoPackage rec { - pname = "singularity"; - version = "3.8.7"; - - src = fetchurl { - url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-Myny5YP4SoNDyywDgKHWy86vrn0eYztcvK33FD6shZs="; - }; - - goPackagePath = "github.com/sylabs/singularity"; - - buildInputs = [ gpgme openssl libuuid ]; - nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ]; - propagatedBuildInputs = [ coreutils squashfsTools ]; - - postPatch = '' - substituteInPlace internal/pkg/build/files/copy.go \ - --replace /bin/cp ${coreutils}/bin/cp - ''; - - postConfigure = '' - cd go/src/github.com/sylabs/singularity - - patchShebangs . - sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - - ./mconfig -V ${version} -p $out --localstatedir=/var - - # Don't install SUID binaries - sed -i 's/-m 4755/-m 755/g' builddir/Makefile - ''; - - buildPhase = '' - runHook preBuild - make -C builddir - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make -C builddir install LOCALSTATEDIR=$out/var - chmod 755 $out/libexec/singularity/bin/starter-suid - - # Explicitly configure paths in the config file - sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf - sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://www.sylabs.io/"; - description = "Application containers for linux"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.jbedo ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix new file mode 100644 index 0000000000..562781b09a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix @@ -0,0 +1,236 @@ +# Configurations that should only be overrided by +# overrideAttrs +{ pname +, version +, src +, projectName # "apptainer" or "singularity" +, vendorHash ? null +, deleteVendor ? false +, proxyVendor ? false +, extraConfigureFlags ? [ ] +, extraDescription ? "" +, extraMeta ? { } +}: + +let + # Workaround for vendor-related attributes not overridable (#86349) + # should be removed when the issue is resolved + _defaultGoVendorArgs = { + inherit + vendorHash + deleteVendor + proxyVendor + ; + }; +in +{ lib +, buildGoModule +, runCommandLocal + # Native build inputs +, makeWrapper +, pkg-config +, util-linux +, which + # Build inputs +, bash +, conmon +, coreutils +, cryptsetup +, fakeroot +, go +, gpgme +, libseccomp +, libuuid + # This is for nvidia-container-cli +, nvidia-docker +, openssl +, squashfsTools +, squashfuse + # Overridable configurations +, enableNvidiaContainerCli ? true + # Compile with seccomp support + # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available. +, enableSeccomp ? true + # Whether the configure script treat SUID support as default +, defaultToSuid ? true + # Whether to compile with SUID support +, enableSuid ? false +, starterSuidPath ? null + # newuidmapPath and newgidmapPath are to support --fakeroot + # where those SUID-ed executables are unavailable from the FHS system PATH. + # Path to SUID-ed newuidmap executable +, newuidmapPath ? null + # Path to SUID-ed newgidmap executable +, newgidmapPath ? null + # Remove the symlinks to `singularity*` when projectName != "singularity" +, removeCompat ? false + # Workaround #86349 + # should be removed when the issue is resolved +, vendorHash ? _defaultGoVendorArgs.vendorHash +, deleteVendor ? _defaultGoVendorArgs.deleteVendor +, proxyVendor ? _defaultGoVendorArgs.proxyVendor +}: + +let + defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; + privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else + (runCommandLocal "privileged-un-utils" { } '' + mkdir -p "$out/bin" + ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" + ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" + ''); +in +buildGoModule { + inherit pname version src; + + # Override vendorHash with the output got from + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # or with `null` when using vendored source tarball. + inherit vendorHash deleteVendor proxyVendor; + + # go is used to compile extensions when building container images + allowGoReference = true; + + strictDeps = true; + + passthru = { + inherit + enableSeccomp + enableSuid + projectName + removeCompat + starterSuidPath + ; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + util-linux + which + ]; + + buildInputs = [ + bash # To patch /bin/sh shebangs. + conmon + cryptsetup + gpgme + libuuid + openssl + squashfsTools + squashfuse + ] + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ++ lib.optional enableSeccomp libseccomp + ; + + configureScript = "./mconfig"; + + configureFlags = [ + "--localstatedir=/var/lib" + "--runstatedir=/var/run" + ] + ++ lib.optional (!enableSeccomp) "--without-seccomp" + ++ lib.optional (defaultToSuid && !enableSuid) "--without-suid" + ++ lib.optional (!defaultToSuid && enableSuid) "--with-suid" + ++ extraConfigureFlags + ; + + # Packages to prefix to the Apptainer/Singularity container runtime default PATH + # Use overrideAttrs to override + defaultPathInputs = [ + bash + coreutils + cryptsetup # cryptsetup + go + privileged-un-utils + squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image + squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges + ] + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ; + + postPatch = '' + if [[ ! -e .git || ! -e VERSION ]]; then + echo "${version}" > VERSION + fi + # Patch shebangs for script run during build + patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts + # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs + substituteInPlace cmd/internal/cli/actions.go \ + --replace "defaultPath = \"${defaultPathOriginal}\"" "defaultPath = \"''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}${defaultPathOriginal}\"" + ''; + + postConfigure = '' + # Code borrowed from pkgs/stdenv/generic/setup.sh configurePhase() + + # set to empty if unset + : ''${configureFlags=} + + # shellcheck disable=SC2086 + $configureScript -V ${version} "''${prefixKey:---prefix=}$prefix" $configureFlags "''${configureFlagsArray[@]}" + + # End of the code from pkgs/stdenv/generic/setup.sh configurPhase() + ''; + + buildPhase = '' + runHook preBuild + make -C builddir -j"$NIX_BUILD_CORES" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make -C builddir install LOCALSTATEDIR="$out/var/lib" + runHook postInstall + ''; + + postFixup = '' + substituteInPlace "$out/bin/run-singularity" \ + --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" + wrapProgram "$out/bin/${projectName}" \ + --prefix PATH : "${lib.makeBinPath [ + fakeroot + squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH + ]}" + # Make changes in the config file + ${lib.optionalString enableNvidiaContainerCli '' + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ + --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" + ''} + ${lib.optionalString (removeCompat && (projectName != "singularity")) '' + unlink "$out/bin/singularity" + for file in "$out"/share/man/man?/singularity*.gz; do + if [[ -L "$file" ]]; then + unlink "$file" + fi + done + for file in "$out"/share/*-completion/completions/singularity; do + if [[ -e "$file" ]] + rm "$file" + done + ''} + ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' + chmod +x $out/libexec/${projectName}/bin/starter-suid + '')} + ${lib.optionalString (enableSuid && !isNull starterSuidPath) '' + mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig} + ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid" + ''} + ''; + + meta = with lib; { + description = "Application containers for linux" + extraDescription; + longDescription = '' + Singularity (the upstream) renamed themselves to Apptainer + to distinguish themselves from a fork made by Sylabs Inc.. See + + https://sylabs.io/2021/05/singularity-community-edition + https://apptainer.org/news/community-announcement-20211130 + ''; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ jbedo ShamrockLee ]; + mainProgram = projectName; + } // extraMeta; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix new file mode 100644 index 0000000000..06c8c4fcc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix @@ -0,0 +1,94 @@ +{ callPackage +, fetchFromGitHub +, nixos +, conmon +}: +let + apptainer = callPackage + (import ./generic.nix rec { + pname = "apptainer"; + # TODO: Upgrade to 1.1.4 only after https://github.com/apptainer/apptainer/pull/967 get merge + # and https://github.com/apptainer/apptainer/issues/958 get fixed + version = "1.1.3"; + projectName = "apptainer"; + + src = fetchFromGitHub { + owner = "apptainer"; + repo = "apptainer"; + rev = "v${version}"; + hash = "sha256-QFg6RC77OE/a6Qlzn6Zi5I7Iaq/U3/m0eI9yLArzuNc="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-tAnh7A8Lw5KtY7hq+sqHMEUlgXvgeeCKKIfRZFoRtug="; + + extraDescription = " (previously known as Singularity)"; + extraMeta.homepage = "https://apptainer.org"; + }) + { + # Apptainer doesn't depend on conmon + conmon = null; + + # defaultToSuid becomes false since Apptainer 1.1.0 + # https://github.com/apptainer/apptainer/pull/495 + # https://github.com/apptainer/apptainer/releases/tag/v1.1.0 + defaultToSuid = false; + }; + + singularity = callPackage + (import ./generic.nix rec { + pname = "singularity-ce"; + version = "3.10.4"; + projectName = "singularity"; + + src = fetchFromGitHub { + owner = "sylabs"; + repo = "singularity"; + rev = "v${version}"; + hash = "sha256-bUnQXQVwaVA3Lkw3X9TBWqNBgiPxAVCHnkq0vc+CIsM="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-K8helLcOuz3E4LzBE9y3pnZqwdwhO/iMPTN1o22ipVg="; + + # Do not build conmon from the Git submodule source, + # Use Nixpkgs provided version + extraConfigureFlags = [ + "--without-conmon" + ]; + + extraDescription = " (Sylabs Inc's fork of Singularity, a.k.a. SingularityCE)"; + extraMeta.homepage = "https://sylabs.io/"; + }) + { + defaultToSuid = true; + }; + + genOverridenNixos = package: packageName: (nixos { + programs.singularity = { + enable = true; + inherit package; + }; + }).config.programs.singularity.packageOverriden.overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + description = ""; + longDescription = '' + This package produces identical store derivations to `pkgs.${packageName}` + overriden and installed by the NixOS module `programs.singularity` + with default configuration. + + This is for binary substitutes only. Use pkgs.${packageName} instead. + ''; + }; + }); +in +{ + inherit apptainer singularity; + + apptainer-overriden-nixos = genOverridenNixos apptainer "apptainer"; + singularity-overriden-nixos = genOverridenNixos singularity "singularity"; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix index 1c648b25dd..dc6f79d6a7 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix @@ -10,18 +10,20 @@ stdenv.mkDerivation rec { hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config getopt + ocamlPackages.ocaml + ocamlPackages.findlib ]; - buildInputs = with ocamlPackages; [ + ocamlPackages.ocaml calendar curses - findlib gettext-stub - ocaml ocaml_libvirt ] ++ [ libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix new file mode 100644 index 0000000000..a7048e83da --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, nixosTests +, cmake +, pkg-config +, mir +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "miriway"; + version = "unstable-2022-12-18"; + + src = fetchFromGitHub { + owner = "Miriway"; + repo = "Miriway"; + rev = "d294c303cb99b7becb0d6686be9a09f0a1f57596"; + hash = "sha256-H+IZgI1IQxNl5yAygbDKXkyXajGHV/mp9gEqZcp0TeE="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" \ + --replace "/usr/share" "\''${CMAKE_INSTALL_DATADIR}" \ + --replace "/etc" "\''${CMAKE_INSTALL_SYSCONFDIR}" + + sed -i -e '/project(/a include(GNUInstallDirs)' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mir + libxkbcommon + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + providedSessions = [ "miriway" ]; + tests = { + inherit (nixosTests) miriway; + }; + }; + + meta = with lib; { + description = "Mir based Wayland compositor"; + longDescription = '' + Miriway is a starting point for creating a Wayland based desktop environment using Mir. + + At the core of Miriway is miriway-shell, a Mir based Wayland compositor that provides: + + - A "floating windows" window managament policy; + - Support for Wayland (and via Xwayland) X11 applications; + - Dynamic workspaces; + - Additional Wayland support for "shell components" such as panels and docs; and, + - Configurable shortcuts for launching standard apps such as launcher and terminal emulator. + + In addition to miriway-shell, Miriway has: + + - A "terminal emulator finder" script miriway-terminal, that works with most terminal emulators; + - A launch script miriway to simplify starting Miriway; + - A default configuration file miriway-shell.config; and, + - A greeter configuration miriway.desktop so Miriway can be selected at login + + Miriway has been tested with shell components from several desktop environments and there are notes on + enabling these in miriway-shell.config. + ''; + homepage = "https://github.com/Miriway/Miriway"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index c539d671e9..5bffa2b205 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,7 +1,5 @@ { lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }: -let buildFHSEnv = callPackage ./env.nix { }; in - args @ { name , runScript ? "bash" diff --git a/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix b/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix index f223009cba..64c6568e1b 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix @@ -10,7 +10,6 @@ # except in special cases. In most cases, use extraNativeBuildArgs instead , nativeImageBuildArgs ? [ "-jar" jar - "-H:CLibraryPath=${lib.getLib graalvm}/lib" (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") "-H:Name=${executable}" "--verbose" @@ -50,6 +49,8 @@ stdenv.mkDerivation (args // { runHook postInstall ''; + disallowedReferences = [ graalvmDrv ]; + meta = { # default to graalvm's platforms platforms = graalvmDrv.meta.platforms; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix index efdbd0decf..b1d8593e72 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix @@ -43,13 +43,15 @@ let (lib.replaceStrings ["."] ["_"] artifactId) "-" version ]; + suffix = if isNull classifier then "" else "-${classifier}"; + filename = "${artifactId}-${version}${suffix}.jar"; mkJarUrl = repoUrl: lib.concatStringsSep "/" [ (lib.removeSuffix "/" repoUrl) (lib.replaceStrings ["."] ["/"] groupId) artifactId version - "${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar" + filename ]; urls_ = if url != "" then [url] @@ -68,7 +70,7 @@ in # packages packages that mention this derivation in their buildInputs. installPhase = '' mkdir -p $out/share/java - ln -s ${jar} $out/share/java/${artifactId}-${version}.jar + ln -s ${jar} $out/share/java/${filename} ''; # We also add a `jar` attribute that can be used to easily obtain the path # to the downloaded jar file. diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix index 448143f769..284cc1586d 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/module.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -145,6 +145,11 @@ let cp -r --reflink=auto vendor $out ''} + if ! [ "$(ls -A $out)" ]; then + echo "vendor folder is empty, please set 'vendorHash = null;' or 'vendorSha256 = null;' in your expression" + exit 10 + fi + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix index 2ded76d3cd..ce3b389b9c 100644 --- a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { + strictDeps = true; + +} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix index 13562acd54..9989e582d2 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix @@ -2,6 +2,7 @@ , callPackage , cargo , cargo-nextest +, clang , lib , makeSetupHook , maturin @@ -126,8 +127,8 @@ in { bindgenHook = callPackage ({}: makeSetupHook { name = "rust-bindgen-hook"; substitutions = { - libclang = rustc.llvmPackages.clang.cc.lib; - clang = rustc.llvmPackages.clang; + libclang = clang.cc.lib; + inherit clang; }; } ./rust-bindgen-hook.sh) {}; diff --git a/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix b/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix index 46df792bdf..9689e41245 100644 --- a/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix @@ -10,8 +10,8 @@ , gawk , util-linux , runtimeShell -, e2fsprogs }: - +, e2fsprogs +}: rec { shellScript = name: text: writeScript name '' @@ -20,40 +20,51 @@ rec { ${text} ''; - mkLayer = { - name, - contents ? [], - }: - runCommand "singularity-layer-${name}" { - inherit contents; - } '' + mkLayer = + { name + , contents ? [ ] + # May be "apptainer" instead of "singularity" + , projectName ? (singularity.projectName or "singularity") + }: + runCommand "${projectName}-layer-${name}" + { + inherit contents; + } '' mkdir $out for f in $contents ; do cp -ra $f $out/ done ''; - buildImage = { - name, - contents ? [], - diskSize ? 1024, - runScript ? "#!${stdenv.shell}\nexec /bin/sh", - runAsRoot ? null, - memSize ? 512 - }: - let layer = mkLayer { - inherit name; - contents = contents ++ [ bash runScriptFile ]; - }; - runAsRootFile = shellScript "run-as-root.sh" runAsRoot; - runScriptFile = shellScript "run-script.sh" runScript; - result = vmTools.runInLinuxVM ( - runCommand "singularity-image-${name}.img" { + buildImage = + let + defaultSingularity = singularity; + in + { name + , contents ? [ ] + , diskSize ? 1024 + , runScript ? "#!${stdenv.shell}\nexec /bin/sh" + , runAsRoot ? null + , memSize ? 512 + , singularity ? defaultSingularity + }: + let + projectName = singularity.projectName or "singularity"; + layer = mkLayer { + inherit name; + contents = contents ++ [ bash runScriptFile ]; + inherit projectName; + }; + runAsRootFile = shellScript "run-as-root.sh" runAsRoot; + runScriptFile = shellScript "run-script.sh" runScript; + result = vmTools.runInLinuxVM ( + runCommand "${projectName}-image-${name}.img" + { buildInputs = [ singularity e2fsprogs util-linux gawk ]; layerClosure = writeReferencesToFile layer; preVM = vmTools.createEmptyImage { size = diskSize; - fullName = "singularity-run-disk"; + fullName = "${projectName}-run-disk"; }; inherit memSize; } @@ -92,19 +103,20 @@ rec { if [ ! -e bin/sh ]; then ln -s ${runtimeShell} bin/sh fi - mkdir -p .singularity.d - ln -s ${runScriptFile} .singularity.d/runscript + mkdir -p .${projectName}.d + ln -s ${runScriptFile} .${projectName}.d/runscript - # Fill out .singularity.d - mkdir -p .singularity.d/env - touch .singularity.d/env/94-appsbase.sh + # Fill out .${projectName}.d + mkdir -p .${projectName}.d/env + touch .${projectName}.d/env/94-appsbase.sh cd .. - mkdir -p /var/singularity/mnt/{container,final,overlay,session,source} + mkdir -p /var/lib/${projectName}/mnt/{container,final,overlay,session,source} echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd echo > /etc/resolv.conf - TMPDIR=$(pwd -P) singularity build $out ./img + TMPDIR=$(pwd -P) ${projectName} build $out ./img ''); - in result; + in + result; } diff --git a/third_party/nixpkgs/pkgs/build-support/testers/default.nix b/third_party/nixpkgs/pkgs/build-support/testers/default.nix index 15694162ed..542133dd95 100644 --- a/third_party/nixpkgs/pkgs/build-support/testers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/testers/default.nix @@ -123,4 +123,5 @@ hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { }; } diff --git a/third_party/nixpkgs/pkgs/build-support/testers/testMetaPkgConfig/tester.nix b/third_party/nixpkgs/pkgs/build-support/testers/testMetaPkgConfig/tester.nix new file mode 100644 index 0000000000..bee97ace14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/testers/testMetaPkgConfig/tester.nix @@ -0,0 +1,14 @@ +{ lib, runCommand, testers }: + +package: + +runCommand "check-meta-pkg-config-modules-for-${package.name}" { + meta = { + description = "Test whether ${package.name} exposes all pkg-config modules ${toString package.meta.pkgConfigModules}"; + }; + dependsOn = map + (moduleName: testers.hasPkgConfigModule { inherit package moduleName; }) + package.meta.pkgConfigModules; +} '' + echo "found all of ${toString package.meta.pkgConfigModules}" > "$out" +'' diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index d8aa6c2324..7318d13f6b 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -509,8 +509,8 @@ rec { '' mkdir -p $out for i in $(cat $pathsPath); do - ${lndir}/bin/lndir -silent $i $out - done + ${lndir}/bin/lndir $i $out + done 2>&1 | sed 's/^/symlinkJoin: warning: keeping existing file: /' ${postBuild} ''; diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index f839ce0c6d..59620b16a6 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2022-07-04"; + version = "unstable-2023-02-06"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "0b95de112857b185b83141ac9324fb0e786c56df"; - sha256 = "sha256-HWkZJd4t7gsbbSGiQ92Lav9EMBPMLXmXFT6HVfyFLSI="; + rev = "ccaa76761a1b100e99287c120196bd5f32d4a403"; + hash = "sha256-RL/94dQiZJ60cXHQ9r4P3hRBqe55oUissCmSp4XLM+o="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/blackout/default.nix b/third_party/nixpkgs/pkgs/data/fonts/blackout/default.nix new file mode 100644 index 0000000000..b615aa66c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/blackout/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "blackout"; + version = "2014-07-29"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "4864cfc1749590e9f78549c6e57116fe98480c0f"; + hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + + runHook postInstall + ''; + + meta = { + description = "A bad-ass, unholy-mother-shut-your-mouth stencil sans-serif"; + longDescription = '' + Eats holes for breakfast lunch and dinner. Inspired by filling in + sans-serif newspaper headlines. Continually updated with coffee and + music. Makes your work louder than the next person’s. + + Comes in three styles: Midnight (solid), 2AM (reversed), & Sunrise + (stroked). + ''; + homepage = "https://www.theleagueofmoveabletype.com/blackout"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/chunk/default.nix b/third_party/nixpkgs/pkgs/data/fonts/chunk/default.nix new file mode 100644 index 0000000000..708393185e --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/chunk/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "chunk"; + version = "2021-03-03"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104"; + hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "An ultra-bold, ultra-awesome slab serif typeface"; + longDescription = '' + Chunk is an ultra-bold slab serif typeface that is reminiscent of old + American Western woodcuts, broadsides, and newspaper headlines. Used + mainly for display, the fat block lettering is unreserved yet refined for + contemporary use. + + In 2014, a new textured style was created by Tyler Finck called Chunk + Five Print. It contains the same glyphs as the original. + ''; + homepage = "https://www.theleagueofmoveabletype.com/chunk"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/fanwood/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fanwood/default.nix new file mode 100644 index 0000000000..ef8be0a652 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/fanwood/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "fanwood"; + version = "2011-05-11"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432"; + hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A serif based on the work of a famous Czech-American type designer of yesteryear"; + longDescription = '' + Based on work of a famous Czech-American type designer of yesteryear. The + package includes roman and italic. + ''; + homepage = "https://www.theleagueofmoveabletype.com/fanwood"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/third_party/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix new file mode 100644 index 0000000000..3fd0352b55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "goudy-bookletter-1911"; + version = "2011-05-11"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "85ff5b834b4f63feb36fd2053949c19660580e48"; + hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A public domain font based on Frederic Goudy’s Kennerley Oldstyle"; + homepage = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 590163fc05..7e3a662fda 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/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 = "17.1.0"; + version = "18.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 53a54f346d..f9609c6c48 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,9 +1,8 @@ { stdenv , lib -, pkgs , buildNpmPackage , fetchFromGitHub -, nodejs +, darwin , remarshal , ttfautohint-nox # Custom font set options. @@ -67,7 +66,13 @@ buildNpmPackage rec { npmDepsHash = "sha256-Ncf07ggyOnz/2SpgdmaYS2X/8Bad+J2sz8Yyx9Iri3E="; - nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ]; + nativeBuildInputs = [ + remarshal + ttfautohint-nox + ] ++ lib.optionals stdenv.isDarwin [ + # libtool + darwin.cctools + ]; buildPlan = if builtins.isAttrs privateBuildPlan then diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 6699023498..6d387516e8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf"; - iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc"; - iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf"; - iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg"; - iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7"; - iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l"; - iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9"; - iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg"; - iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i"; - iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc"; - iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj"; - iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f"; - iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq"; - iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2"; - iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05"; - iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0"; - iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw"; - iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m"; - iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7"; - iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni"; - iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v"; - iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf"; - iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j"; - iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7"; - sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv"; - sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz"; - sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q"; - sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r"; - sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b"; - sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0"; - sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37"; - sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc"; - sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i"; - sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi"; - sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y"; - sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq"; - sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq"; - sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip"; - sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27"; - sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh"; - sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7"; - sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88"; - sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h"; - sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r"; - sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k"; - sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1"; - sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh"; - sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261"; - sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9"; - sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9"; - sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19"; - sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b"; - sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg"; - sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9"; - sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp"; - sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2"; - sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899"; - sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n"; - sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg"; - sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr"; - sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h"; - sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb"; - sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz"; - sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19"; - sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0"; - sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f"; - sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq"; - sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq"; - sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb"; - sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531"; - sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8"; - sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q"; - sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7"; - sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw"; - sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z"; - sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d"; - sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3"; - sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3"; - sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j"; - sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk"; - sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9"; - sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2"; - sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c"; - sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9"; - sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94"; - sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6"; - sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7"; - sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw"; - sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6"; - sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw"; - sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g"; - sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip"; + iosevka = "03f2rabj2w2l7jwqyl2awj42jhh0l3picqgyfcv3q067i34abfyn"; + iosevka-aile = "0p1r5sysy6djfd1sx0pfxf42bv7ayqgk1nvil33jr925w96i2dp6"; + iosevka-curly = "0r33wcgvh315avgkkic27qpf3bavrqwbig1kj4wm5rdr957ldk40"; + iosevka-curly-slab = "0yd7grhnx7z27xmd3wr8x2xx2002hmfi1y3ndmqq1sc9gab5gcb7"; + iosevka-etoile = "0jhd49vxxxaqi1rxfkmpc3v1q96ak1b5wyggchngqi3739pjgqy3"; + iosevka-slab = "00wk15kj9b1nr3b0bmarx6gqx3jg8z1pm9qqf9x09s72b3ng8adm"; + iosevka-ss01 = "1kp6zv8zyx50la7zrfz4fis68s41kplibagny61w5v3w36xpm3cs"; + iosevka-ss02 = "1c0dl28a3wwa5g4793jyb4n4c8p5vjlyh1b8j2i5da31dqrqm9gj"; + iosevka-ss03 = "0vs8x6l8gwqi47g1c5ainsk5fb2i6j4wv7mgdyw5j5l3blnba5yh"; + iosevka-ss04 = "1caf4xqd1dywzbq06ip042rw88833yk9ws7y3vjvsp93g7a2r675"; + iosevka-ss05 = "008aphj4w6ri3fgnydrxavvpm3bfywv4cym10fqi9xgd84jhm9m1"; + iosevka-ss06 = "00dkagqiwzwzvv75zss82yx0gdcbmh9xvr8swhi5zk0y0bc3xk2y"; + iosevka-ss07 = "1acnva081awp76xyspksq9jkvlyswh3q1jy9gnsc6kh4vyn17vjs"; + iosevka-ss08 = "0lmkglcjlppvfd7k2pz57r476fa4c0q5l4gqzfy1mlklh0mc5hqb"; + iosevka-ss09 = "04r2k2z54iszwfnif872p5br0dm4fvc5341cpbxv4almpzxjyqnr"; + iosevka-ss10 = "1c6gs9g8dhywpd2ha7kx2l7g7bwj7i5a78645ipx8126f749y0y9"; + iosevka-ss11 = "0286k56r12a2yjylxynvzd0idrcv4ykrmpkn3b5xv9f74qq6irmf"; + iosevka-ss12 = "0ab4x5lh8spbg0djb092vcq1cnvjhazwkia8byq1q47iwiyh756l"; + iosevka-ss13 = "0kva71mfkl9xzz8khjzgrj47zg2505rg0hv5hxflawxsqwi4iwvl"; + iosevka-ss14 = "1gk7m3xh4v3jm6s5g2prd27w4p0r1blbxsxdy3b020bdwikxcaga"; + iosevka-ss15 = "0frxjc3hhay8izsx4ywff4j39qxp9ljz6hvw0rjcya3vny515jq5"; + iosevka-ss16 = "1g299yhn0kfc7vn8vbgwq4798w5lcl72j6hj91k90i1yq11lg13i"; + iosevka-ss17 = "02z83x73bhpgf44kq0gw46bdnpqzr4vm37h78bh19vydzqaj8hg0"; + iosevka-ss18 = "1b7vhhbspi98xzmk4hpiw08jmscm7f7nibqxhkfmppl6y0ymbm9d"; + sgr-iosevka = "1n60dgprl2p22wwfhxpwy9v9xf6vyv3qwm2jdc0m9m0q9jwjashr"; + sgr-iosevka-aile = "1k195vqv2wajhmyma43xgda3s2z86kl2gksgdrm95s9sx7ijns2s"; + sgr-iosevka-curly = "15yq1fs7knp9gxgqjxslpmlx85c6kvpm31sf81llpf4k5f9dmlcp"; + sgr-iosevka-curly-slab = "0fa68lm6iwlf2s5k8388dwgk015c55zg1wkhhhjmixwn7p8gifxz"; + sgr-iosevka-etoile = "1ry1zc7cdx6g927d1752ipz39v4wsnfrnn8n9cfwamz8v458wld1"; + sgr-iosevka-fixed = "173v09dx5pwsbh9jac5qxi7nk95dqyryg747hl58bchby6kmnc3k"; + sgr-iosevka-fixed-curly = "11y8bj9vmdq48n370f1r4zsk72ci3cq7c9ff6y40hn5w40s8k379"; + sgr-iosevka-fixed-curly-slab = "1a4gmz6sl67l23awkfl8f3xdr8hbb2mi1lsc0ain1wvvyx1bi56m"; + sgr-iosevka-fixed-slab = "11xv18ykrfg2fdvbrlcx7k3qvp5yqbm278ks3gm0gbck1awvfckg"; + sgr-iosevka-fixed-ss01 = "1yb96x53wjks537vs0gd7rss6piszs139k1kgb1swrpq7519awaz"; + sgr-iosevka-fixed-ss02 = "10yy0yg2i9nm00lzpmrfbdh7jjcll37wql3fcsaxha57gcxf9nf0"; + sgr-iosevka-fixed-ss03 = "1fpjfqlqq6lz3gya1q24nzy2xls6nxn567lhglj0ykjnh3prkll8"; + sgr-iosevka-fixed-ss04 = "1kwa5mwd6ihsyj2y70hrrvgy41cs19i0f7nvl4khs3i69a1l58ag"; + sgr-iosevka-fixed-ss05 = "08v8in8s8p2nayazq60w1kc1jpq48nwdwh6wbxv7ij7lfwii8xws"; + sgr-iosevka-fixed-ss06 = "03jzylw99xa3b6hpy6bpwhyii6d9fggy9synfl54sn7smwqk08wr"; + sgr-iosevka-fixed-ss07 = "13yzd6r51gka03fcl3bvx6d97b4m4px2cnsd724maqkqrcxkbxgb"; + sgr-iosevka-fixed-ss08 = "1xghlj7drx9328jr1cb051nkwv47r5ykkyy6ydff1c4amc1xabsq"; + sgr-iosevka-fixed-ss09 = "12l6lbz4m1lwyqqmv583777r9ymssy9x34rz72y3dch0mqhmjjzg"; + sgr-iosevka-fixed-ss10 = "1flrh6a7m0dw7na30nhbxjld54517z77ff3s9fjrpmgyb9wz7i2j"; + sgr-iosevka-fixed-ss11 = "1j4v4h6k505gkxyswcjf61kj9cfgkalxjg1arms9zb351p8rrkda"; + sgr-iosevka-fixed-ss12 = "00qwnsxc08bm5cq3ljz2pjqsiw019ah4z0crqcwaysijicxmbckc"; + sgr-iosevka-fixed-ss13 = "0jrw0amhfi28mc4i7a74qvgjamvymijlf3akskaw9qrmzvks8wn1"; + sgr-iosevka-fixed-ss14 = "0rvh842zkxdrna9nh2ylsjs3q90sq39658l0mafi85b8z5asdwai"; + sgr-iosevka-fixed-ss15 = "0j5yrr1biqfhgj6qg6359xg9rfv6qzqiqdqjgfjwbhijs6xfn8f1"; + sgr-iosevka-fixed-ss16 = "06jrfhb257nmldnxxyc5rh869r5y62v2y034c0r9j7354s7gcq7a"; + sgr-iosevka-fixed-ss17 = "0cgmsh0478963k1dgpkhy6j1b383gx2q09z3shr6j87knjjwqgp0"; + sgr-iosevka-fixed-ss18 = "0r4nyd459aqgna7dyzvxnznclqihxdb888g949kdzhxykfchq53s"; + sgr-iosevka-slab = "1bv8asz66hn80xvjxa7b0vgywha1bpmhd8q95cssc3085dprz1r6"; + sgr-iosevka-ss01 = "0sv19w0adnddzarf8dlz0n73jzqnp0xfb2lgh4xcpjkhm66j3fhh"; + sgr-iosevka-ss02 = "1ih10a666r77pvj57crdgyn7ll15giwxj0nis501r1fkp1bzkscn"; + sgr-iosevka-ss03 = "180hkjzzgasf9a58vi0n0cishnbyjgbjmkh60awcpxwvh85qd4hf"; + sgr-iosevka-ss04 = "1i4rpg9j967xaxg8h9dmachd3896f4jgwxa0mfjlizls2hfvnbsi"; + sgr-iosevka-ss05 = "1ca2z4dincjk7jl16pa6d7dnnzq3w3il7fr2lphvrjvdrxbci615"; + sgr-iosevka-ss06 = "08dj9dcq58grnp6lh16yvvzjqhzlm765v4ci1rys0wbjnp72xxda"; + sgr-iosevka-ss07 = "13k6plhdgxhp5gjs8z98wb480hh5wy6p2zmc4xvhp88y93fy8kk7"; + sgr-iosevka-ss08 = "1zfxamanq6a06fazn1jkaswh5g6iw22qnycg5dnxn4flk8nas1db"; + sgr-iosevka-ss09 = "0qaxp4fsvl26il16h78y2l8013m49cbk2nzxcs1k9g5if11a49d3"; + sgr-iosevka-ss10 = "1qvvm6rvhrbp83qjfb3dfsbam20f6aw52kg1i5ggfrqj35niv0hd"; + sgr-iosevka-ss11 = "1v2b456qj8kyacm7308gsim5p25wnyg8qabyrfvdj00h81s31akl"; + sgr-iosevka-ss12 = "1rsi6ir5vccar0n3ychisc40axiyhqj5yvcx450ppd33f3sd5rc7"; + sgr-iosevka-ss13 = "12x4q5l1pdxi065zs913dqd7zb8qpi4bbgd43h3k5azsrwxwvixr"; + sgr-iosevka-ss14 = "1snzdv23jqmbz25k9i2zl7px7yysk5hn74q1x251s07ghdx3nfdj"; + sgr-iosevka-ss15 = "0hbmj6wij6cv9yh76npp4xrl7fdm8jjx03398anfcsa02gkvg8zz"; + sgr-iosevka-ss16 = "0v6vhg0vp5ig6ngs96q5mxa2snfp08nk68a9772sm1ny61q3chrq"; + sgr-iosevka-ss17 = "0268b85yhdfsbjyhi0vlxwrpwxa8h919np53s060z94094h6jd9x"; + sgr-iosevka-ss18 = "13vnhh8181h36y6iz2p2x6rjgjv5w3d0gqbcdkwhgmvx7s03k122"; + sgr-iosevka-term = "05c2sxb4aris90mhjxyfkw1b0ga0hplfas669076h7yjsimw647l"; + sgr-iosevka-term-curly = "1j0b4fhcivkdgka9zyqf732hcxj8rchqxkwv2bwxib1a17fmwn6c"; + sgr-iosevka-term-curly-slab = "0dvv2n3plfxm8z2xi1ihzn4rncyk1kz8xbgyprnb0lvqiyf18igy"; + sgr-iosevka-term-slab = "0i7wrvq6c96q8v6zw9iym42b6sbm0vc04ysljghpblnnfymq5yv9"; + sgr-iosevka-term-ss01 = "1n23qp50pr466blpn2h9dhjbn0wnbbxyzb0sz751bk8db41lpyqb"; + sgr-iosevka-term-ss02 = "0ghvfhkdsfsjb8yjwvwlwhn66lmy8dx34126ccnvj0g77ww2nwa9"; + sgr-iosevka-term-ss03 = "03hnmy9wijqwsc36cg5b3pxj7mb1cbyacii00pcvrpcns2w1ssbw"; + sgr-iosevka-term-ss04 = "0fv9xhhii0h5ii4yxsdnywn45254494mgq1n5aajasq494cgxhp4"; + sgr-iosevka-term-ss05 = "0qa4l77sjpxd9l4nb555bhgzm0f1c74w6014md2rpljjvyy2mzwg"; + sgr-iosevka-term-ss06 = "05y7rmghvhmzw3spn7b3v6hmpcqg5p32flm437a1aljdr46sbxli"; + sgr-iosevka-term-ss07 = "1lzqgpr1vchi4ricqp1v49nv62rl3anbdvzpvddby81wr5jcyd1y"; + sgr-iosevka-term-ss08 = "1sxicv2gspc39fyja370dpiq12xd1bgndiw5r6cqfkkd8x8dgpdv"; + sgr-iosevka-term-ss09 = "0ax9pgm3d171kksrqd2z8xpr68kdxkqg9h344an55gjk01q7dzay"; + sgr-iosevka-term-ss10 = "1rgvadmvdldcaqa0r76kzmrck814qwksdqficaxcd7wk8bx64n81"; + sgr-iosevka-term-ss11 = "02if14ff5kax4p1aa2wkbidhwlzgyxi7lxir2ildahwfkvkp971y"; + sgr-iosevka-term-ss12 = "0sj8n12is4094nbj67wkk88953jp9235kvvr4230abql1g6s263r"; + sgr-iosevka-term-ss13 = "006sdcj8qw247b63d647ykm8razyb0apsfd0cjmlikj9hdmyzrr2"; + sgr-iosevka-term-ss14 = "0i7d3ldp9rj1f4kwdk8hkxq0s38df6i25qfx6hwfjj1c5bl3a843"; + sgr-iosevka-term-ss15 = "15gjqz7zc6wwy1l61pgpnz7wwyyaij43dcrwcwyi6h10jhm8b3ia"; + sgr-iosevka-term-ss16 = "1c1i1iyqzgh3pz4fzjp26d71lphmcgqbjp2s91yyqg3nfhwbzvyc"; + sgr-iosevka-term-ss17 = "0kr58576vlx81nb2ia5z9226m6h0ybd5vzfj5li9b721l4q0rpky"; + sgr-iosevka-term-ss18 = "1zjs40i4dmw2l45k8wydngl4g3a88nhbmmjwd5lsz8a40pq4bw15"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/junction/default.nix b/third_party/nixpkgs/pkgs/data/fonts/junction/default.nix new file mode 100644 index 0000000000..7f5ba5c4a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/junction/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "junction"; + version = "2014-05-29"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535"; + hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "Junction is a a humanist sans-serif font"; + longDescription = '' + Junction is a a humanist sans-serif, and the first open-source type + project started by The League of Moveable Type. It has been updated + (2014) to include additional weights (light/bold) and expanded + international support. + ''; + homepage = "https://www.theleagueofmoveabletype.com/junction"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/knewave/default.nix b/third_party/nixpkgs/pkgs/data/fonts/knewave/default.nix new file mode 100644 index 0000000000..eaadb7afc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/knewave/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "knewave"; + version = "2012-07-30"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb"; + hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = " A bold, painted face for the rocker within"; + longDescription = '' + Knewave is bold, painted face. Get it? Git it. + ''; + homepage = "https://www.theleagueofmoveabletype.com/knewave"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-gothic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/league-gothic/default.nix new file mode 100644 index 0000000000..4186eb70f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/league-gothic/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchzip, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "league-gothic"; + version = "1.601"; + + src = fetchzip { + url = "https://github.com/theleagueof/league-gothic/releases/download/${self.version}/LeagueGothic-${self.version}.tar.xz"; + hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf + + runHook postInstall + ''; + + meta = { + description = "A revival of an old classic, Alternate Gothic #1"; + longDescription = '' + League Gothic is a revival of an old classic, and one of our favorite + typefaces, Alternate Gothic #1. It was originally designed by Morris + Fuller Benton for the American Type Founders Company in 1903. The company + went bankrupt in 1993, and since the original typeface was created before + 1923, the typeface is in the public domain. + + We decided to make our own version, and contribute it to the Open Source + Type Movement. Thanks to a commission from the fine & patient folks over + at WND.com, it’s been revised & updated with contributions from Micah + Rich, Tyler Finck, and Dannci, who contributed extra glyphs. + ''; + homepage = "https://www.theleagueofmoveabletype.com/league-gothic"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix b/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix index f6855dc99d..905cf0a9ad 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -1,35 +1,46 @@ -{lib, stdenv, fetchurl, unzip, raleway}: +{ lib +, symlinkJoin +, the-neue-black +, blackout +, chunk +, fanwood +, goudy-bookletter-1911 +, junction-font +, knewave +, league-gothic +, league-script-number-one +, league-spartan +, linden-hill +, orbitron +, ostrich-sans +, prociono +, raleway +, sniglet +, sorts-mill-goudy +}: -let +symlinkJoin { + name = "league-of-moveable-type"; - # TO UPDATE: - # ./update.sh > ./fonts.nix - # we use the extended version of raleway (same license). - fonts = [raleway] - ++ map fetchurl (builtins.filter (f: f.name != "raleway.zip") (import ./fonts.nix)); - -in -stdenv.mkDerivation rec { - - baseName = "league-of-moveable-type"; - version = "2016-10-15"; - name="${baseName}-${version}"; - - srcs = fonts; - - nativeBuildInputs = [ unzip ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp */*.otf $out/share/fonts/opentype - # for Raleway, where the fonts are already in /share/… - cp */share/fonts/opentype/*.otf $out/share/fonts/opentype - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0"; + paths = [ + the-neue-black + blackout + chunk + fanwood + goudy-bookletter-1911 + junction-font + knewave + league-gothic + league-script-number-one + league-spartan + linden-hill + orbitron + ostrich-sans + prociono + raleway + sniglet + sorts-mill-goudy + ]; meta = { description = "Font Collection by The League of Moveable Type"; @@ -46,6 +57,6 @@ stdenv.mkDerivation rec { license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ bergey Profpatsch ]; + maintainers = with lib.maintainers; [ bergey minijackson Profpatsch ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/fonts.nix deleted file mode 100644 index efbe6a4c41..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/fonts.nix +++ /dev/null @@ -1,82 +0,0 @@ -[ - { - url = "https://www.theleagueofmoveabletype.com/league-spartan/download"; - sha256 = "1z9pff8xm58njs7whaxb3sq4vbdkxv7llwgm9nqhwshmgr52jrm1"; - name = "league-spartan.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/junction/download"; - sha256 = "1qbhfha012ma26n43lm1fh06i7z47wk50r8qsp09bpxc5yr4ypi7"; - name = "junction.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/ostrich-sans/download"; - sha256 = "11ydhbgcfhmydcnim64vb035cha14krxxrbf62426dm6bvxkphp3"; - name = "ostrich-sans.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; - sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; - name = "league-gothic.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/blackout/download"; - sha256 = "1r7dihnjvy4fgvaj5m4llc9dm4cpdl1l79mhg3as16qvjgazms3p"; - name = "blackout.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/knewave/download"; - sha256 = "065yiakhm6h6jkmigj4pqm2qi6saph0pwb7g8s9gwkskhkk5iy57"; - name = "knewave.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/fanwood/download"; - sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; - name = "fanwood.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; - sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; - name = "linden-hill.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/league-script-number-one/download"; - sha256 = "056hb02a5vydrq5q0gwzanp2zkrrv1spm8sfc5wzhyfzgwd1vc76"; - name = "league-script-number-one.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/raleway/download"; - sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; - name = "raleway.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/prociono/download"; - sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; - name = "prociono.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/orbitron/download"; - sha256 = "156w4j324d350pvjmzdg2w8inhhdfzrvb86rhlavgd9sxx2fykk4"; - name = "orbitron.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; - sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; - name = "goudy-bookletter-1911.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; - sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; - name = "sorts-mill-goudy.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/chunk/download"; - sha256 = "15mbqwz90y1n4vlj2xkc8vd56va6la5qnxhiipvcmkrng5y3931j"; - name = "chunk.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/sniglet/download"; - sha256 = "1lhpnjm52gyhy9s2kwbsg1rd9iyrqli5q9ngp141igx4p1bgbqkc"; - name = "sniglet.zip"; - } -] diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/update.sh b/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/update.sh deleted file mode 100644 index 4d41df4fdb..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -SITE=https://www.theleagueofmoveabletype.com - -# since there is no nice way to get all the fonts, -# this fetches the homepage and extracts their names from the html … -fonts=$(curl "$SITE" 2>/dev/null | \ - sed -ne 's//dev/null) - cat < +Date: Fri, 25 Mar 2022 18:20:17 +0800 +Subject: [PATCH] fix install path for nix + +--- + qimage-plugins/libraw/CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/qimage-plugins/libraw/CMakeLists.txt b/qimage-plugins/libraw/CMakeLists.txt +index 4bfd85ad..00d11bd3 100644 +--- a/qimage-plugins/libraw/CMakeLists.txt ++++ b/qimage-plugins/libraw/CMakeLists.txt +@@ -44,7 +44,6 @@ target_include_directories(xraw PUBLIC ${RAW_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIR + + target_link_libraries(${CMD_NAME} Qt5::Core Qt5::Gui raw) + +-install(TARGETS ${CMD_NAME} DESTINATION ${Qt5Core_DIR}/../../qt5/plugins/imageformats) +- ++install(TARGETS ${CMD_NAME} DESTINATION qt5/plugins/imageformats) + + QT5_USE_MODULES(${PROJECT_NAME} Core Gui) +-- +2.35.1 + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix new file mode 100644 index 0000000000..0b51bc42b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, gio-qt +, udisks2-qt5 +, image-editor +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, libraw +, libexif +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-image-viewer"; + version = "5.9.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-5A6K47NcMkvncZIF5CXeHYYZWEHQ4YDnPDQr2axCmaI="; + }; + + patches = [ + ./0001-fix-install-path-for-nix.patch + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-image-viewer/commit/4a046e6207fea306e592fddc33c1285cf719a63d.patch"; + sha256 = "sha256-aIgYmq6WDfCE+ZcD0GshxM+QmBWZGjh9MzZcTMrhBJ0="; + }) + (fetchpatch { + name = "fix build with libraw 0.21"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; + sha256 = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; + }) + ]; + + postPatch = '' + substituteInPlace src/com.deepin.ImageViewer.service \ + --replace "/usr/bin/deepin-image-viewer" "$out/bin/deepin-image-viewer" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + gio-qt + udisks2-qt5 + image-editor + libraw + libexif + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "An image viewing tool with fashion interface and smooth performance"; + homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix new file mode 100644 index 0000000000..0d710652e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qttools +, pkg-config +, wrapQtAppsHook +, dtkwidget +, qtsvg +, xorg +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-picker"; + version = "5.0.28"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-b463PqrCpt/DQqint5Xb0cRT66iHNPavj0lsTMv801k="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qtsvg + xorg.libXtst + ]; + + postPatch = '' + substituteInPlace com.deepin.Picker.service \ + --replace "/usr/bin/deepin-picker" "$out/bin/deepin-picker" + ''; + + qmakeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "ICONDIR=${placeholder "out"}/share/icons/hicolor/scalable/apps" + "APPDIR=${placeholder "out"}/share/applications" + "DSRDIR=${placeholder "out"}/share/deepin-picker" + "DOCDIR=${placeholder "out"}/share/dman/deepin-picker" + ]; + + meta = with lib; { + description = "Color picker application"; + homepage = "https://github.com/linuxdeepin/deepin-picker"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix index 69f6afff8e..2cb3e282b4 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -3,6 +3,15 @@ let packages = self: let inherit (self) callPackage; + + replaceAll = x: y: '' + echo Replacing "${x}" to "${y}": + for file in $(grep -rl "${x}"); do + echo -- $file + substituteInPlace $file \ + --replace "${x}" "${y}" + done + ''; in { #### LIBRARIES dtkcommon = callPackage ./library/dtkcommon { }; @@ -21,14 +30,33 @@ let udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; #### Dtk Application + deepin-album = callPackage ./apps/deepin-album { }; deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-compressor = callPackage ./apps/deepin-compressor { }; + deepin-draw = callPackage ./apps/deepin-draw { }; + deepin-editor = callPackage ./apps/deepin-editor { }; + deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; + deepin-picker = callPackage ./apps/deepin-picker { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; + #### Go Packages + go-lib = callPackage ./go-package/go-lib { inherit replaceAll; }; + go-gir-generator = callPackage ./go-package/go-gir-generator { }; + go-dbus-factory = callPackage ./go-package/go-dbus-factory { }; + deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; + + #### TOOLS + deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; + #### ARTWORK dde-account-faces = callPackage ./artwork/dde-account-faces { }; deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; + + #### MISC + deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; + deepin-turbo = callPackage ./misc/deepin-turbo { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix new file mode 100644 index 0000000000..040c561d35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoPackage +, pkg-config +, deepin-gettext-tools +, go-dbus-factory +, go-gir-generator +, go-lib +, gtk3 +, glib +, libxcrypt +, gettext +, iniparser +, cracklib +, linux-pam +}: + +buildGoPackage rec { + pname = "deepin-pw-check"; + version = "5.1.18"; + + goPackagePath = "github.com/linuxdeepin/deepin-pw-check"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-v1Z4ArkrejjOCO1vD+BhfEl9pTfuvKgLM6Ont0IUCQk="; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + pkg-config + gettext + deepin-gettext-tools + ]; + + buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + glib + libxcrypt + gtk3 + iniparser + cracklib + linux-pam + ]; + + postPatch = '' + sed -i 's|iniparser/||' */*.c + substituteInPlace misc/pkgconfig/libdeepin_pw_check.pc \ + --replace "/usr" "$out" + substituteInPlace misc/system-services/com.deepin.daemon.PasswdConf.service \ + --replace "/usr/lib/deepin-pw-check/deepin-pw-check" "$out/lib/deepin-pw-check/deepin-pw-check" + ''; + + buildPhase = '' + runHook preBuild + GOPATH="$GOPATH:${go-dbus-factory}/share/gocode" + GOPATH="$GOPATH:${go-gir-generator}/share/gocode" + GOPATH="$GOPATH:${go-lib}/share/gocode" + make -C go/src/${goPackagePath} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install PREFIX="$out" PKG_FILE_DIR=$out/lib/pkg-config PAM_MODULE_DIR=$out/etc/pam.d -C go/src/${goPackagePath} + # https://github.com/linuxdeepin/deepin-pw-check/blob/d5597482678a489077a506a87f06d2b6c4e7e4ed/debian/rules#L21 + ln -s $out/lib/libdeepin_pw_check.so $out/lib/libdeepin_pw_check.so.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to verify the validity of the password"; + homepage = "https://github.com/linuxdeepin/deepin-pw-check"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix new file mode 100644 index 0000000000..509940b6d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix @@ -0,0 +1,75 @@ +[ + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.5.1"; + sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY="; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.1.0"; + sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0="; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.7.1"; + sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w="; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "289d7a0edf712062d9f1484b07bdf2383f48802f"; + sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs="; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc"; + sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk="; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.3.0"; + sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw="; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"; + sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90="; + }; + } +] + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix new file mode 100644 index 0000000000..4c12dce491 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "go-dbus-factory"; + version = "1.10.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-6u9Bpoa80j/K1MipncfM378/qmSSMZAlx88jE4hHYBk="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Generate go binding of D-Bus interfaces"; + homepage = "https://github.com/linuxdeepin/go-dbus-factory"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix new file mode 100644 index 0000000000..7f377d2a6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, go +, pkg-config +, libgudev +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "go-gir-generator"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-lFseui/M3+TyfYoa+rnS0cGhN6gdLrgpzgOwqzYcyPk="; + }; + + nativeBuildInputs = [ + pkg-config + go + ]; + + buildInputs = [ + libgudev + gobject-introspection + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "GOCACHE=$(TMPDIR)/go-cache" + ]; + + meta = with lib; { + description = "Generate static golang bindings for GObject"; + homepage = "https://github.com/linuxdeepin/go-gir-generator"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-lib/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-lib/default.nix new file mode 100644 index 0000000000..3a6a8f03df --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-lib/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, replaceAll +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "go-lib"; + version = "5.8.27"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ZV5zWu7UvNKVcVo79/iKMhF4H09rGyDCvEL61H05lZc="; + }; + + patches = [ + (fetchpatch { + name = "fix_IsDir_for_symlink"; + url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch"; + sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4="; + }) + ]; + + postPatch = replaceAll "/bin/sh" "${runtimeShell}"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gocode/src/github.com/linuxdeepin/go-lib + cp -a * $out/share/gocode/src/github.com/linuxdeepin/go-lib + rm -r $out/share/gocode/src/github.com/linuxdeepin/go-lib/debian + runHook postInstall + ''; + + meta = with lib; { + description = "Library containing many useful go routines for things such as glib, gettext, archive, graphic, etc"; + homepage = "https://github.com/linuxdeepin/go-lib"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix index af34c6cfb7..b3e5a18913 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -17,16 +17,20 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.3"; + version = "5.6.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g="; + sha256 = "sha256-MZkhTvjTyBrlntgFq2F3iGK7WvfmnGJQLk5B1OM5kQo="; }; - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ dtkwidget diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix new file mode 100644 index 0000000000..8aaf7929c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: +stdenvNoCC.mkDerivation rec { + pname = "deepin-desktop-base"; + version = "2022.03.07"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-joAduRI9jUtPA4lNsEhgOZlci8j/cvD8rJThqvj6a8A="; + }; + + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; + + # distribution_logo_transparent.svg come form nixos-artwork(https://github.com/NixOS/nixos-artwork)/logo/nixos-white.svg under CC-BY license, used for dde-lock + postInstall = '' + rm -r $out/etc + rm -r $out/usr/share/python-apt + rm -r $out/usr/share/plymouth + rm -r $out/usr/share/distro-info + mv $out/usr/* $out/ + rm -r $out/usr + install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg + ''; + + meta = with lib; { + description = "Base assets and definitions for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg b/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg new file mode 100644 index 0000000000..18f8d4055c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-turbo/default.nix new file mode 100644 index 0000000000..7eaca57686 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/misc/deepin-turbo/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, dtkwidget +}: + +stdenv.mkDerivation rec { + pname = "deepin-turbo"; + version = "0.0.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-t6/Ws/Q8DO0zBzrUr/liD61VkxbOv4W4x6VgMWr+Ozk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + ]; + + postPatch = '' + substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out" + ''; + + meta = with lib; { + description = "A daemon that helps to launch dtk applications faster"; + homepage = "https://github.com/linuxdeepin/deepin-turbo"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix new file mode 100644 index 0000000000..d219e6d73b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, gettext +, python3Packages +, perlPackages +}: + +stdenv.mkDerivation rec { + pname = "deepin-gettext-tools"; + version = "1.0.10"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-5Dd2QU6JYwuktusssNDfA7IHa6HbFcWo9sZf5PS7NtI="; + }; + + postPatch = '' + substituteInPlace src/generate_mo.py --replace "sudo cp" "cp" + ''; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ + gettext + perlPackages.perl + perlPackages.ConfigTiny + perlPackages.XMLLibXML + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postFixup = '' + wrapPythonPrograms + wrapPythonProgramsIn "$out/lib/${pname}" + wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB + ''; + + meta = with lib; { + description = "Translation file processing utils for DDE development"; + homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 0cb6f374f2..ba83f42fce 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.3"; + version = "43.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE="; + sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix index 67ac1cfa97..2459c3535e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix @@ -23,6 +23,7 @@ , wrapGAppsHook , librsvg , webp-pixbuf-loader +, libheif , libexif , gobject-introspection , gi-docgen @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { extraLoaders = [ librsvg webp-pixbuf-loader + libheif.out ]; }}" ''; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix index 1bb1f4384b..f5eb4c5e80 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix @@ -15,13 +15,17 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.43.0"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sNfKHgwYaPoY8FwhAmDYp74fCO4Tt/XP26ubYfoW+DM="; + sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U="; }; + patches = [ + ./fix-icon-install.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch new file mode 100644 index 0000000000..d412cc4a5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch @@ -0,0 +1,12 @@ +diff --git a/data/meson.build b/data/meson.build +index 339b3cff..aca65efd 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -9,5 +9,6 @@ install_data( + 'zenity-text.png', + 'zenity-scale.png', + 'zenity-entry.png', +- 'zenity-notification.png'] ++ 'zenity-notification.png'], ++ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps', + ) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 81622db59c..d21f994a43 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -12,6 +12,7 @@ , nvme-cli , procps , pulseaudio +, libgtop , python3 , smartmontools , substituteAll @@ -112,6 +113,15 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ rhoriguchi ]; })) + (patchExtension "tophat@fflewddur.github.io" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/tophat_at_fflewddur.github.io.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) + ]; + })) + (patchExtension "unite@hardpixel.eu" (old: { buildInputs = [ xprop ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch new file mode 100644 index 0000000000..03b016cae2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch @@ -0,0 +1,13 @@ +diff --git a/extension.js b/extension.js +index 60396f8..b044872 100644 +--- a/extension.js ++++ b/extension.js +@@ -20,6 +20,8 @@ + + /* exported init, enable, disable */ + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++ + let depFailures = []; + let missingLibs = []; + diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 4d3c09a9f2..08755700b7 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ToRY27qB/cNKjKW22MTEojxxOXMBfO1LUusy/pXKJ9A="; + sha256 = "sha256-XWDhQ5Nu+gGj0/TQ/fALxQJ+QXzMiHm0Qh9FlGiskEA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index a558664862..d2ec15c09c 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.2.1"; + version = "6.2.2"; outputs = [ "out" "dev" ]; @@ -37,18 +36,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-pJFeMG2aGaMkS00fSoRlMR2YSg5YzwqwaQT8G7Gk5S4="; + sha256 = "sha256-YV7fcRaLaDwa0m6zbdhayCAqeON5nqEdQ1IUtDKu5AY="; }; - patches = [ - # Ensure special user directory icon used for bookmark - # https://github.com/elementary/files/pull/2106 - (fetchpatch { - url = "https://github.com/elementary/files/commit/00b1c2a975aeab378ed6eb1d90c8988f82596add.patch"; - sha256 = "sha256-F/Vk7dg57uBBMO4WOJ/7kKbRNMZuWZ3QfrBfEIBozbw="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson diff --git a/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix index 9c7e8e3d0a..639ca81227 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "aspectj"; - version = "1.9.9.1"; + version = "1.9.19"; builder = ./builder.sh; src = let versionSnakeCase = builtins.replaceStrings ["."] ["_"] version; in fetchurl { url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - sha256 = "sha256-kiMQuEPXoSpHUiInkfYsrfCAcSc6mX42TRIBbeIQhWs="; + sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M="; }; inherit jre; diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix new file mode 100644 index 0000000000..ce06782eb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, cmake +, coreutils +, python3 +, git +, fetchFromGitHub +, ninja +}: + +let + pythonEnv = python3.withPackages (ps: [ ps.psutil ]); +in +stdenv.mkDerivation rec { + pname = "circt"; + version = "1.29.0"; + src = fetchFromGitHub { + owner = "llvm"; + repo = "circt"; + rev = "firtool-${version}"; + sha256 = "sha256-HsXwh98RZuXvK/KkZ2NAGwWNLxUAQVj+WKzZXd4C4Is="; + fetchSubmodules = true; + }; + + requiredSystemFeatures = [ "big-parallel" ]; + + nativeBuildInputs = [ cmake ninja git pythonEnv ]; + + cmakeDir = "../llvm/llvm"; + cmakeFlags = [ + "-DLLVM_ENABLE_BINDINGS=OFF" + "-DLLVM_ENABLE_OCAMLDOC=OFF" + "-DLLVM_BUILD_EXAMPLES=OFF" + "-DLLVM_OPTIMIZED_TABLEGEN=ON" + "-DLLVM_ENABLE_PROJECTS=mlir" + "-DLLVM_EXTERNAL_PROJECTS=circt" + "-DLLVM_EXTERNAL_CIRCT_SOURCE_DIR=.." + "-DCIRCT_LLHD_SIM_ENABLED=OFF" + ]; + + # There are some tests depending on `clang-tools` to work. They are activated only when detected + # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these + # tests work. Because + # + # 1. The absolute paths of binaries used in tests are resolved in configure phase. + # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, + # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in + # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. + # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. + # + # As a temporary fix, we disabled these tests when using clang stdenv + LIT_FILTER_OUT = lib.optionalString stdenv.cc.isClang "CIRCT :: Target/ExportSystemC/.*\.mlir"; + + preConfigure = '' + substituteInPlace test/circt-reduce/test/annotation-remover.mlir --replace "/usr/bin/env" "${coreutils}/bin/env" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv bin/{{fir,hls}tool,circt-{as,dis,lsp-server,opt,reduce,translate}} $out/bin + runHook postInstall + ''; + + doCheck = true; + checkTarget = "check-circt check-circt-integration"; + + meta = { + description = "Circuit IR compilers and tools"; + homepage = "https://circt.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sharzy ]; + platforms = lib.platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index d084889dca..748869ea63 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2022.11.19"; + version = "2023.02.01"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-IJMzRi335RbK8mEXQaF1UDPC0JVi6zSqcz6RS874m3Q="; + hash = "sha256-sLhbIGF7j1tH8zKsPq1qOSwHvYDrVCyfln9UbE3IYv0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 76374201f4..6ce7779d56 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -158,34 +158,32 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + langAda + libxcrypt + gnatboot + version + texinfo + which + gettext + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + zip + perl ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc libxcrypt - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 1d3dff7c6f..482cc5f362 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -164,34 +164,32 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + langAda + libxcrypt + gnatboot + version + texinfo + which + gettext + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + zip + perl ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc libxcrypt - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix index 3fe6620987..5d8205a755 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix @@ -198,35 +198,34 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + langAda + langGo + libucontext + libxcrypt + gnatboot + version + texinfo + which + gettext + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + zip + perl ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc libxcrypt - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optional (langGo && stdenv.hostPlatform.isMusl) libucontext) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 810706ed0f..e2e9cb66d0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -158,37 +158,38 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + version + langJava + javaAwtGtk + texinfo + which + gettext + pkg-config + gnused + patchelf + gmp + mpfr + libmpc + cloog + isl + zlib + boehmgc + zip + unzip + gtk2 + libart_lgpl + perl + xlibs ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (cloog != null) cloog) - ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; preConfigure = import ../common/pre-configure.nix { inherit lib; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index e25af867e5..eba68c39fd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -178,37 +178,38 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + version + langJava + javaAwtGtk + texinfo + which + gettext + pkg-config + gnused + patchelf + gmp + mpfr + libmpc + cloog + isl + zlib + boehmgc + zip + unzip + gtk2 + libart_lgpl + perl + xlibs ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (cloog != null) cloog) - ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; preConfigure = import ../common/pre-configure.nix { inherit lib; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 450b233103..27d57a509a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -193,38 +193,40 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config) - ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + version + langAda + gnatboot + flex + langJava + javaAwtGtk + texinfo + which + gettext + pkg-config + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + boehmgc + zip + unzip + gtk2 + libart_lgpl + perl + xlibs ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index a0465e8bdd..d22e85c61a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -165,33 +165,29 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + version + texinfo + which + gettext + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + zip + perl ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 03fb9fb120..2b43fc124b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -147,33 +147,29 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + version + texinfo + which + gettext + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + zip + perl ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 317c77ea83..ebf0bf0563 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -158,34 +158,31 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) + inherit (import ../common/dependencies.nix { + inherit + lib + stdenv + buildPackages + targetPackages + crossStageStatic + threadsCross + langAda + gnatboot + version + texinfo + which + gettext + gnused + patchelf + gmp + mpfr + libmpc + isl + zlib + zip + perl ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix new file mode 100644 index 0000000000..a193ec887a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, version +, buildPackages +, targetPackages +, texinfo +, which +, gettext +, pkg-config ? null +, gnused +, patchelf +, gmp +, mpfr +, libmpc +, libucontext ? null +, libxcrypt ? null +, cloog ? null +, isl ? null +, zlib ? null +, gnatboot ? null +, flex ? null +, boehmgc ? null +, zip ? null +, unzip ? null +, gtk2 ? null +, libart_lgpl ? null +, perl ? null +, xlibs ? null +, langJava ? false +, javaAwtGtk ? false +, langAda ? false +, langGo ? false +, crossStageStatic ? null +, threadsCross ? null +}: + +let + inherit (lib) optionals; + inherit (stdenv) buildPlatform hostPlatform targetPlatform; +in + +{ + # same for all gcc's + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + texinfo + which + gettext + ] + ++ optionals (perl != null) [ perl ] + ++ optionals javaAwtGtk [ pkg-config ] + ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ] + ++ optionals langAda [ gnatboot ] + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ optionals buildPlatform.isDarwin [ gnused ] + ; + + # For building runtime libs + # same for all gcc's + depsBuildTarget = + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ + # build != host == target + stdenv.cc + ] + ) + ++ optionals targetPlatform.isLinux [ patchelf ]; + + buildInputs = [ + gmp + mpfr + libmpc + ] + ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ] + ++ [ + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] + ++ optionals (cloog != null) [ cloog ] + ++ optionals (isl != null) [ isl ] + ++ optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc zip unzip ] + ++ optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs) + ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ] + ; + + # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too + depsTargetTarget = optionals (!crossStageStatic && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ]; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index bd2d4413ec..023fc81474 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -28,10 +28,6 @@ # Path for the sources file that will be used # See `update.nix` file for a description on how this file works , sourcesPath ? ./. + "/graalvm${javaVersion}-ce-sources.json" - # Use musl instead of glibc to allow true static builds in GraalVM's - # Native Image (i.e.: `--static --libc=musl`). This will cause glibc static - # builds to fail, so it should be used with care -, useMusl ? false }: { stdenv @@ -66,6 +62,12 @@ , gtk3 , jq , writeShellScript + # Use musl instead of glibc to allow true static builds in GraalVM's + # Native Image (i.e.: `--static --libc=musl`). This will cause glibc static + # builds to fail, so it should be used with care +, useMusl ? false + # Extra libraries to be included in native-image using '-H:CLibraryPath' flag +, extraCLibs ? [ ] }: assert useMusl -> stdenv.isLinux; @@ -76,6 +78,11 @@ let name = "graalvm${javaVersion}-ce"; sources = builtins.fromJSON (builtins.readFile sourcesPath); + cLibs = [ glibc zlib.static ] + ++ lib.optionals (!useMusl) [ glibc.static ] + ++ lib.optionals useMusl [ musl ] + ++ extraCLibs; + runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); @@ -118,6 +125,8 @@ let ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; unpackPhase = '' + runHook preUnpack + unpack_jar() { jar=$1 unzip -q -o $jar -d $out @@ -164,13 +173,13 @@ let for jar in "''${arr[@]:1}"; do unpack_jar "$jar" done + + runHook postUnpack ''; - outputs = [ "out" "lib" ]; - installPhase = '' - # ensure that $lib/lib exists to avoid breaking builds - mkdir -p "$lib/lib" + runHook preInstall + # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ @@ -181,26 +190,15 @@ let if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF ${ - lib.optionalString (stdenv.isLinux) '' - # provide libraries needed for static compilation - ${ - if useMusl then - ''for f in "${musl.stdenv.cc.cc}/lib/"* "${musl}/lib/"* "${zlib.static}/lib/"*; do'' - else - ''for f in "${glibc}/lib/"* "${glibc.static}/lib/"* "${zlib.static}/lib/"*; do'' - } - ln -s "$f" "$out/lib/svm/clibraries/${platform.arch}/$(basename $f)" - done - - # add those libraries to $lib output too, so we can use them with - # `native-image -H:CLibraryPath=''${lib.getLib graalvmXX-ce}/lib ...` and reduce - # closure size by not depending on GraalVM $out (that is much bigger) - # we always use glibc here, since musl is only supported for static compilation - for f in "${glibc}/lib/"*; do - ln -s "$f" "$lib/lib/$(basename $f)" - done + # Wrap native-image binary to pass -H:CLibraryPath flag and find glibc + lib.optionalString (withNativeImageSvm && stdenv.isLinux) '' + wrapProgram $out/bin/native-image \ + ${lib.concatStringsSep " " + (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} '' } + + runHook postInstall ''; dontStrip = true; @@ -240,6 +238,8 @@ let doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck + echo ${ lib.escapeShellArg '' public class HelloWorld { @@ -252,16 +252,25 @@ let $out/bin/javac HelloWorld.java # run on JVM with Graal Compiler + echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + ${ + lib.optionalString withNativeImageSvm '' + echo "Ahead-Of-Time compilation" + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld + ./helloworld | fgrep 'Hello World' + '' + } + ${# --static flag doesn't work for darwin lib.optionalString (withNativeImageSvm && stdenv.isLinux && !useMusl) '' - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld + echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" + $out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld ./helloworld | fgrep 'Hello World' echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image --no-server --static HelloWorld + $out/bin/native-image --static HelloWorld ./helloworld | fgrep 'Hello World' '' } @@ -269,7 +278,7 @@ let ${# --static flag doesn't work for darwin lib.optionalString (withNativeImageSvm && stdenv.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image --no-server --libc=musl --static HelloWorld + $out/bin/native-image --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' '' } @@ -302,6 +311,8 @@ let echo '1 + 1' | $out/bin/irb '' } + + runHook postInstallCheck ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix index cb78eb5c6b..a07e724cbd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.8.0"; + version = "1.8.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-C7lBn6yYMqVqOhnK0oL48tbxI30tRn3I3+m9SipDxC4="; + hash = "sha256-TD+nvBu57zBYojGdi8w7cZYHn4jpL9zY0wSkb0trV4c="; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix index 9288fafa6f..c7de19cd5b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.8.0"; + version = "1.8.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "19dcc2ylh11vxirglda8xrrm06i2nd53ndd8b1smf2vyj0v9593m"; - "macos-x86_64" = "0pkc4g09qwp4lcvs62qis0zxdjbr9z5mbgyi4mczxx5kqha4fxp3"; - "linux-x86_64" = "124nvhjh9xj8nsdjf71vzsgfjdq6mc0nalk79xfvsp2wh7xd8d0n"; + "macos-aarch64" = "119ar6wax0bkp5fmardplhsvaw1jhpfr5xgkpkkv10nmx4agbkh8"; + "macos-x86_64" = "1nqqzx397k1ifpdymaw39iz5mzpyi7n00kpw03y5iq5avzr7rsjj"; + "linux-x86_64" = "0hlpda33y07d8dybjn65gzdl0ws0r8vda515pr2rhfisls18lp2c"; }.${arch}; in fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix index c1be5230e2..4a40a931af 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix index 46d6c6628e..5912323608 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix index b6659034e8..c75eb255cd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -85,8 +85,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix index d040e2b397..ca7a17a5e9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -101,8 +101,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix index 2493dcde0c..cd28325a55 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -106,8 +106,15 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then + echo "ERROR: python files not installed where expected!"; + return 1; + fi + if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then + echo "ERROR: lua files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch index f69ed9e162..f2a3b27296 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch @@ -2,15 +2,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 79d451965ed4..78188978d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH +@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH # If we are not building as part of LLVM, build LLDB as a standalone project, # using LLVM as an external library. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + include(GNUInstallDirs) + project(lldb) - include(LLDBStandalone) - + set(LLDB_BUILT_STANDALONE TRUE) + endif() +@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") +@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua") + else() +- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}") ++ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}") + endif() + get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR) + finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}") diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake index 3291a7c808e1..b27d27ce6a87 100644 --- a/cmake/modules/AddLLDB.cmake @@ -34,3 +52,16 @@ index 7d48491ec89a..c04543585588 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 7d48491ec89a..c04543585588 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -70,7 +70,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix index 3612211542..4e8cdcdf8a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -75,8 +75,11 @@ stdenv.mkDerivation rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix index 57560ccbfe..49cc0a0d42 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -80,8 +80,11 @@ stdenv.mkDerivation rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix index 4f2b081b4d..903fdb54fe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation { sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; }; - buildInputs = [ ocaml findlib ocamlbuild yojson menhir menhirLib ulex pprint fix functory ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ yojson menhir menhirLib ulex pprint fix functory ]; # Sets warning 3 as non-fatal prePatch = lib.optionalString (check-ocaml-version "4.02") '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix index af895131de..3e13b9247f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix @@ -1,8 +1,11 @@ { lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { pname = "obliv-c"; + version = "0.0pre20210621"; - buildInputs = [ perl ] + + strictDeps = true; + nativeBuildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix index 6dca665ad9..732d33608e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix @@ -12,19 +12,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-etzEXbILje+CrfJxIhH7jthEMoSJdS6O33QoG8HrLvI="; }; + strictDeps = true; nativeBuildInputs = [ makeWrapper menhir - ]; - - buildInputs = [ + ocaml + menhir cppo dune_3 findlib + ]; + + buildInputs = [ fix - menhir menhirSdk - ocaml ppxlib utop ] ++ lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; diff --git a/third_party/nixpkgs/pkgs/development/compilers/stanc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/stanc/default.nix index e3df16230a..b4d0c5e682 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/stanc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/stanc/default.nix @@ -22,9 +22,11 @@ ocamlPackages.buildDunePackage rec { --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd" ''; + nativeBuildInputs = with ocamlPackages; [ + menhir + ]; buildInputs = with ocamlPackages; [ core_unix - menhir menhirLib ppx_deriving fmt diff --git a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix index 2c8d6eb21a..cae9a17ccc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "uasm"; - version = "2.55"; + version = "2.56.2"; src = fetchFromGitHub { owner = "Terraspace"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { # the given path has multiple possibilities: #, # # Probably because upstream has both a tag and a branch with the same name rev = "refs/tags/v${version}"; - sha256 = "sha256-CIbHPKJa60SyJeFgF1Tux7RfJZBChhUVXR7HGa+gCtQ="; + hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = [ (fetchpatch { name = "fix-v2_55-compilation-on-macos.patch"; url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix index fb33f92bcc..0e7225a184 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix @@ -27,8 +27,10 @@ let compcert = mkCoqDerivation rec { "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ makeWrapper ocaml findlib menhir coq coq2html ]; + buildInputs = with ocamlPackages; [ menhirLib ]; propagatedBuildInputs = [ flocq ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix index b6e2df653b..922a601584 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,10 +7,12 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.16"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; + release."3.3.0".sha256 = "sha256-bh9qP/EhWrHpTe2GMGG3S2vgBSSK088mFfhAIGejVoU="; release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4"; release."3.1.0".sha256 = "02i0djar13yk01hzaqprcldhhscn9843x9nf6x3jkv4wv1jwnx9f"; release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; diff --git a/third_party/nixpkgs/pkgs/development/em-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/em-modules/generic/default.nix index 2f8d7d878a..eac0fcde53 100644 --- a/third_party/nixpkgs/pkgs/development/em-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/em-modules/generic/default.nix @@ -1,12 +1,20 @@ { pkgs, lib, emscripten, python3 }: +argsFun: + +let + wrapDerivation = f: + pkgs.stdenv.mkDerivation (finalAttrs: + f (lib.toFunction argsFun finalAttrs) + ); +in +wrapDerivation ( { buildInputs ? [], nativeBuildInputs ? [] , enableParallelBuilding ? true , meta ? {}, ... } @ args: -pkgs.stdenv.mkDerivation ( args // { diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix index 3fbeaab387..99f1f6e784 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv, installShellFiles }: let @@ -13,6 +13,10 @@ let sha256 = "sha256-jew4KLpOOXE9N/h4qFqof8y26DQrvm78E/ARbbwocD4="; }; + nativeBuildInputs = [ + installShellFiles + ]; + subPackages = [ "." ]; vendorSha256 = "sha256-BunonnjzGnpcmGJXxEQXvjJLGvdSXUOK9zAhXoAemHY="; @@ -23,6 +27,15 @@ let "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + postInstall = '' + export HOME="$(mktemp -d)" + for s in {bash,zsh,fish}; do + $out/bin/arduino-cli completion $s > completion.$s + installShellCompletion --cmd arduino-cli --$s completion.$s + done + unset HOME + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Arduino from the command line"; @@ -46,7 +59,9 @@ if stdenv.isLinux then extraInstallCommands = '' mv $out/bin/$name $out/bin/arduino-cli + cp -r ${pkg.outPath}/share $out/share ''; + passthru.pureGoPkg = pkg; targetPkgs = pkgs: with pkgs; [ zlib diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 548110cafc..303a6ff400 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1139,7 +1139,7 @@ self: super: { # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; - # hasn‘t bumped upper bounds + # hasn’t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index baa8752e1e..7604a1c507 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -69,7 +69,7 @@ self: super: { # Pick right versions for GHC-specific packages ghc-api-compat = doDistribute (unmarkBroken self.ghc-api-compat_8_10_7); - # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # ghc versions which don’t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; @@ -77,7 +77,7 @@ self: super: { base-noprelude = doJailbreak super.base-noprelude; unliftio-core = doJailbreak super.unliftio-core; - # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10. + # Jailbreaking because monoidal-containers hasn’t bumped it's base dependency for 8.10. monoidal-containers = doJailbreak super.monoidal-containers; # Jailbreak to fix the build. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ddd41bc57e..92278ebb0e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,13 +94,13 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; - # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. + # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; # Older compilers need the latest ghc-lib to build this package. hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin; - # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; mmorph = super.mmorph_1_1_3; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 941f95c07f..903b177efa 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -125,12 +125,12 @@ self: super: { liquid-vector = markBroken super.liquid-vector; liquidhaskell = markBroken super.liquidhaskell; - # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. + # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_7; ormolu = super.ormolu_0_2_0_0; - # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); @@ -143,7 +143,7 @@ self: super: { ghc-lib-parser = self.ghc-lib-parser_8_10_7_20220219; - # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # ghc versions which don’t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser self.ghc-lib-parser-ex_8_10_0_24; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d61ab5200c..961178a06d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -667,7 +667,7 @@ dont-distribute-packages: - yices-easy - yices-painless - # These packages don‘t build because they use deprecated webkit versions. + # These packages don’t build because they use deprecated webkit versions. - diagrams-hsqml - dialog - ghcjs-dom-webkit diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 26d2e2aef4..4105a01945 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -1115,7 +1115,7 @@ self: super: builtins.intersectAttrs super { hls-splice-plugin hls-refactor-plugin hls-cabal-plugin; - # Tests have file permissions expections that don‘t work with the nix store. + # Tests have file permissions expections that don’t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; hls-gadt-plugin = dontCheck super.hls-gadt-plugin; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch deleted file mode 100644 index 9e1eeb7516..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 -From: Mikhail Glushenkov -Date: Wed, 10 Apr 2019 17:42:57 +0100 -Subject: [PATCH] Allow http-client 0.6.*. - -Changelog doesn't list any silently breaking semantic changes. ---- - amazonka/amazonka.cabal | 2 +- - core/amazonka-core.cabal | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal -index e86713f11c..81c4cb7e48 100644 ---- a/amazonka.cabal -+++ b/amazonka.cabal -@@ -67,7 +67,7 @@ library - , conduit-extra >= 1.1 - , directory >= 1.2 - , exceptions >= 0.6 -- , http-client >= 0.4 && < 0.6 -+ , http-client >= 0.4 && < 0.7 - , http-conduit >= 2.1.7 && < 3 - , http-types >= 0.8 - , ini >= 0.3.5 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch deleted file mode 100644 index d99072d79c..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 -From: Mikhail Glushenkov -Date: Wed, 10 Apr 2019 17:42:57 +0100 -Subject: [PATCH] Allow http-client 0.6.*. - -Changelog doesn't list any silently breaking semantic changes. ---- - amazonka/amazonka.cabal | 2 +- - core/amazonka-core.cabal | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal -index 9796e007cf..eccb24e5bd 100644 ---- a/amazonka-core.cabal -+++ b/amazonka-core.cabal -@@ -90,7 +90,7 @@ library - , deepseq >= 1.4 - , exceptions >= 0.6 - , hashable >= 1.2 -- , http-client >= 0.4 && < 0.6 -+ , http-client >= 0.4 && < 0.7 - , http-conduit >= 2.1.4 && < 3 - , http-types >= 0.8 && (<0.11 || >=0.12) - , lens >= 4.4 --- -2.23.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch deleted file mode 100644 index 04ff068e1d..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch +++ /dev/null @@ -1,333 +0,0 @@ -From 2490fa65eeba52699a7c0e303aa5cb9b78c2b1cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Fri, 17 Apr 2020 20:49:23 +0200 -Subject: [PATCH] Compile against GHC 8.8 - ---- - Setup.hs | 15 --------------- - src/Darcs/Patch/Depends.hs | 2 +- - src/Darcs/Patch/Match.hs | 12 ++++++------ - src/Darcs/Patch/PatchInfoAnd.hs | 2 +- - src/Darcs/Patch/Prim/V1/Apply.hs | 6 +++--- - src/Darcs/Patch/Prim/V1/Commute.hs | 1 + - src/Darcs/Patch/ReadMonads.hs | 1 + - src/Darcs/Patch/V1/Commute.hs | 1 + - src/Darcs/Repository/Diff.hs | 2 +- - src/Darcs/Repository/Match.hs | 2 +- - src/Darcs/Util/Tree/Monad.hs | 4 ++-- - 12 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/Setup.hs b/Setup.hs -index f5cc3e8..05caac4 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -75,21 +75,6 @@ - postInst = \ _ flags pkg lbi -> - installManpage pkg lbi (fromFlag $ installVerbosity flags) NoCopyDest, - -- sDistHook = \ pkg lbi hooks flags -> do -- let pkgVer = packageVersion pkg -- verb = fromFlag $ sDistVerbosity flags -- x <- versionPatches verb pkgVer -- y <- context verb -- rewriteFileEx silent "release/distributed-version" $ show x -- rewriteFileEx silent "release/distributed-context" $ show y -- putStrLn "about to hand over" -- let pkg' = pkg { library = sanity (library pkg) } -- sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } -- sanity _ = error "eh" -- sanity' bi = bi { otherModules = [ m | m <- otherModules bi, toFilePath m /= "Version" ] } -- -- sDistHook simpleUserHooks pkg' lbi hooks flags -- , - postConf = \_ _ _ _ -> return () --- Usually this checked for external C - --- dependencies, but we already have performed such - --- check in the confHook ---- a/darcs.cabal 1970-01-01 01:00:01.000000000 +0100 -+++ b/darcs.cabal 2020-04-18 10:26:07.605129733 +0200 -@@ -1,6 +1,5 @@ - Name: darcs - version: 2.14.2 --x-revision: 1 - License: GPL-2 - License-file: COPYING - Author: David Roundy , -@@ -75,7 +74,7 @@ - description: Use libcurl for HTTP support. - - -- in future this could extend to any other external libraries, ---- e.g. libiconv -+-- e.g. libiconv - flag pkgconfig - description: Use pkgconfig to configure libcurl - default: False -@@ -113,7 +112,7 @@ - -- ---------------------------------------------------------------------- - - custom-setup -- setup-depends: base >= 4.9 && < 4.13, -+ setup-depends: base >= 4.9 && <5, - Cabal >= 1.24, - process >= 1.2.3.0 && < 1.7, - filepath >= 1.4.1 && < 1.5.0.0, -@@ -381,7 +380,7 @@ - else - build-depends: unix >= 2.7.1.0 && < 2.8 - -- build-depends: base >= 4.9 && < 4.13, -+ build-depends: base >= 4.9 && <5, - stm >= 2.1 && < 2.6, - binary >= 0.5 && < 0.10, - containers >= 0.5.6.2 && < 0.7, -@@ -402,19 +401,19 @@ - tar >= 0.5 && < 0.6, - data-ordlist == 0.4.*, - attoparsec >= 0.13.0.1 && < 0.14, -- zip-archive >= 0.3 && < 0.5, -+ zip-archive >= 0.3 && <1, - async >= 2.0.2 && < 2.3, -- sandi >= 0.4 && < 0.6, -+ sandi >= 0.4 && <1, - unix-compat >= 0.4.2 && < 0.6, - bytestring >= 0.10.6 && < 0.11, - old-time >= 1.1.0.3 && < 1.2, - time >= 1.5.0.1 && < 1.10, -- text >= 1.2.1.3 && < 1.3, -+ text >= 1.2.1.3 && <2, - directory >= 1.2.6.2 && < 1.4, - process >= 1.2.3.0 && < 1.7, - array >= 0.5.1.0 && < 0.6, - random >= 1.1 && < 1.2, -- hashable >= 1.2.3.3 && < 1.3, -+ hashable >= 1.2.3.3 && <2, - mmap >= 0.5.9 && < 0.6, - zlib >= 0.6.1.2 && < 0.7.0.0, - network-uri == 2.6.*, -@@ -443,7 +442,7 @@ - - -- The terminfo package cannot be built on Windows. - if flag(terminfo) && !os(windows) -- build-depends: terminfo >= 0.4.0.2 && < 0.5 -+ build-depends: terminfo >= 0.4.0.2 && <1 - cpp-options: -DHAVE_TERMINFO - - default-extensions: -@@ -500,7 +499,7 @@ - cc-options: -D_REENTRANT - - build-depends: darcs, -- base >= 4.9 && < 4.13 -+ base >= 4.9 && <5 - - -- ---------------------------------------------------------------------- - -- unit test driver -@@ -518,7 +517,7 @@ - build-depends: Win32 >= 2.3.1 && < 2.4 - - build-depends: darcs, -- base >= 4.9 && < 4.13, -+ base >= 4.9 && <5, - array >= 0.5.1.0 && < 0.6, - bytestring >= 0.10.6 && < 0.11, - cmdargs >= 0.10.10 && < 0.11, -@@ -527,15 +526,15 @@ - mtl >= 2.2.1 && < 2.3, - shelly >= 1.6.8 && < 1.9, - split >= 0.2.2 && < 0.3, -- text >= 1.2.1.3 && < 1.3, -+ text >= 1.2.1.3 && <2, - directory >= 1.2.6.2 && < 1.4, - FindBin >= 0.0.5 && < 0.1, -- QuickCheck >= 2.8.2 && < 2.13, -+ QuickCheck >= 2.8.2 && <3, - HUnit >= 1.3 && < 1.7, - test-framework >= 0.8.1.1 && < 0.9, - test-framework-hunit >= 0.3.0.2 && < 0.4, - test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, -- zip-archive >= 0.3 && < 0.5 -+ zip-archive >= 0.3 && <1 - - -- https://github.com/yesodweb/Shelly.hs/issues/177 - if os(windows) -diff --git a/src/Darcs/Patch/Depends.hs b/src/Darcs/Patch/Depends.hs -index 8531294..a4c71cb 100644 ---- a/src/Darcs/Patch/Depends.hs -+++ b/src/Darcs/Patch/Depends.hs -@@ -251,7 +251,7 @@ splitOnTag _ (PatchSet NilRL NilRL) = Nothing - unwrapOneTagged :: (Monad m) => PatchSet rt p wX wY -> m (PatchSet rt p wX wY) - unwrapOneTagged (PatchSet (ts :<: Tagged t _ tps) ps) = - return $ PatchSet ts (tps :<: t +<+ ps) --unwrapOneTagged _ = fail "called unwrapOneTagged with no Tagged's in the set" -+unwrapOneTagged _ = error "called unwrapOneTagged with no Tagged's in the set" - - -- | @getUncovered ps@ returns the 'PatchInfo' for all the patches in - -- @ps@ that are not depended on by anything else *through explicit -diff --git a/src/Darcs/Patch/Match.hs b/src/Darcs/Patch/Match.hs -index aba6c7a..2b6f53a 100644 ---- a/src/Darcs/Patch/Match.hs -+++ b/src/Darcs/Patch/Match.hs -@@ -421,7 +421,7 @@ getNonrangeMatchS fs repo = - Just m -> if nonrangeMatcherIsTag fs - then getTagS m repo - else getMatcherS Exclusive m repo -- Nothing -> fail "Pattern not specified in getNonrangeMatch." -+ Nothing -> error "Pattern not specified in getNonrangeMatch." - - -- | @firstMatch fs@ tells whether @fs@ implies a "first match", that - -- is if we match against patches from a point in the past on, rather -@@ -441,7 +441,7 @@ getFirstMatchS fs repo = - Just (_,b) -> unpullLastN repo b -- b is chronologically earlier than a - Nothing -> - case firstMatcher fs of -- Nothing -> fail "Pattern not specified in getFirstMatchS." -+ Nothing -> error "Pattern not specified in getFirstMatchS." - Just m -> if firstMatcherIsTag fs - then getTagS m repo - else getMatcherS Inclusive m repo -@@ -462,7 +462,7 @@ checkMatchSyntax :: [MatchFlag] -> IO () - checkMatchSyntax opts = - case getMatchPattern opts of - Nothing -> return () -- Just p -> either fail (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) -+ Just p -> either error (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) - - getMatchPattern :: [MatchFlag] -> Maybe String - getMatchPattern [] = Nothing -@@ -718,7 +718,7 @@ getMatcherS :: (ApplyMonad (ApplyState p) m, Matchable p) => - getMatcherS ioe m repo = - if matchExists m repo - then applyInvToMatcher ioe m repo -- else fail $ "Couldn't match pattern "++ show m -+ else error $ "Couldn't match pattern "++ show m - - getTagS :: (ApplyMonad (ApplyState p) m, MonadProgress m, Matchable p) => - Matcher rt p -> PatchSet rt p Origin wX -> m () -diff --git a/src/Darcs/Patch/PatchInfoAnd.hs b/src/Darcs/Patch/PatchInfoAnd.hs -index 2da7ec8..1147410 100644 ---- a/src/Darcs/Patch/PatchInfoAnd.hs -+++ b/src/Darcs/Patch/PatchInfoAnd.hs -@@ -167,7 +167,7 @@ conscientiously er (PIAP pinf hp) = - - -- | @hopefullyM@ is a version of @hopefully@ which calls @fail@ in a - -- monad instead of erroring. --hopefullyM :: Monad m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) -+hopefullyM :: MonadFail m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) - hopefullyM (PIAP pinf hp) = case hopefully2either hp of - Right p -> return p - Left e -> fail $ renderString -diff --git a/src/Darcs/Patch/Prim/V1/Apply.hs b/src/Darcs/Patch/Prim/V1/Apply.hs -index bea7e41..7984d21 100644 ---- a/src/Darcs/Patch/Prim/V1/Apply.hs -+++ b/src/Darcs/Patch/Prim/V1/Apply.hs -@@ -41,13 +41,13 @@ instance Apply Prim where - apply (FP f (TokReplace t o n)) = mModifyFilePS f doreplace - where doreplace fc = - case tryTokReplace t (BC.pack o) (BC.pack n) fc of -- Nothing -> fail $ "replace patch to " ++ fn2fp f -+ Nothing -> error $ "replace patch to " ++ fn2fp f - ++ " couldn't apply." - Just fc' -> return fc' - apply (FP f (Binary o n)) = mModifyFilePS f doapply - where doapply oldf = if o == oldf - then return n -- else fail $ "binary patch to " ++ fn2fp f -+ else error $ "binary patch to " ++ fn2fp f - ++ " couldn't apply." - apply (DP d AddDir) = mCreateDirectory d - apply (DP d RmDir) = mRemoveDirectory d -@@ -115,7 +115,7 @@ applyHunk f h fc = - case applyHunkLines h fc of - Right fc' -> return fc' - Left msg -> -- fail $ -+ error $ - "### Error applying:\n" ++ renderHunk h ++ - "\n### to file " ++ fn2fp f ++ ":\n" ++ BC.unpack fc ++ - "### Reason: " ++ msg -diff --git a/src/Darcs/Patch/Prim/V1/Commute.hs b/src/Darcs/Patch/Prim/V1/Commute.hs -index 7639dbd..e1432e6 100644 ---- a/src/Darcs/Patch/Prim/V1/Commute.hs -+++ b/src/Darcs/Patch/Prim/V1/Commute.hs -@@ -58,6 +58,7 @@ instance Monad Perhaps where - Failed >>= _ = Failed - Unknown >>= _ = Unknown - return = Succeeded -+instance MonadFail Perhaps where - fail _ = Unknown - - instance Alternative Perhaps where -diff --git a/src/Darcs/Patch/ReadMonads.hs b/src/Darcs/Patch/ReadMonads.hs -index 62a4f81..e1cb149 100644 ---- a/src/Darcs/Patch/ReadMonads.hs -+++ b/src/Darcs/Patch/ReadMonads.hs -@@ -237,6 +237,7 @@ failSM _ = SM (\_ -> Nothing) - instance Monad SM where - (>>=) = bindSM - return = returnSM -+instance MonadFail SM where - fail = failSM - - instance ParserM SM where -diff --git a/src/Darcs/Patch/V1/Commute.hs b/src/Darcs/Patch/V1/Commute.hs -index 0bb41a3..c6c3382 100644 ---- a/src/Darcs/Patch/V1/Commute.hs -+++ b/src/Darcs/Patch/V1/Commute.hs -@@ -93,6 +93,7 @@ instance Monad Perhaps where - Failed >>= _ = Failed - Unknown >>= _ = Unknown - return = Succeeded -+instance MonadFail Perhaps where - fail _ = Unknown - - instance Alternative Perhaps where -diff --git a/src/Darcs/Repository/Diff.hs b/src/Darcs/Repository/Diff.hs -index 8078d49..e0e2341 100644 ---- a/src/Darcs/Repository/Diff.hs -+++ b/src/Darcs/Repository/Diff.hs -@@ -138,7 +138,7 @@ treeDiff da ft t1 t2 = do - do rmDirP <- diff p (Removed subtree) - addFileP <- diff p (Changed (File emptyBlob) b') - return $ joinGap (+>+) rmDirP addFileP -- diff p _ = fail $ "Missing case at path " ++ show p -+ diff p _ = error $ "Missing case at path " ++ show p - - text_diff p a b - | BL.null a && BL.null b = emptyGap NilFL -diff --git a/src/Darcs/Repository/Match.hs b/src/Darcs/Repository/Match.hs -index 08c9f13..f33cabe 100644 ---- a/src/Darcs/Repository/Match.hs -+++ b/src/Darcs/Repository/Match.hs -@@ -60,7 +60,7 @@ getNonrangeMatch :: (ApplyMonad (ApplyState p) DefaultIO, IsRepoType rt, RepoPat - getNonrangeMatch r = withRecordedMatch r . getMatch where - getMatch fs = case hasIndexRange fs of - Just (n, m) | n == m -> applyNInv (n-1) -- | otherwise -> fail "Index range is not allowed for this command." -+ | otherwise -> error "Index range is not allowed for this command." - _ -> getNonrangeMatchS fs - - getOnePatchset :: (IsRepoType rt, RepoPatch p) -diff --git a/src/Darcs/Util/Tree/Monad.hs b/src/Darcs/Util/Tree/Monad.hs -index 0e01d9b..296fdc4 100644 ---- a/src/Darcs/Util/Tree/Monad.hs -+++ b/src/Darcs/Util/Tree/Monad.hs -@@ -216,7 +216,7 @@ instance (Monad m) => TreeRO (TreeMonad m) where - t <- gets tree - let f = findFile t p' - case f of -- Nothing -> fail $ "No such file " ++ show p' -+ Nothing -> error $ "No such file " ++ show p' - Just x -> lift (readBlob x) - - currentDirectory = ask -@@ -251,7 +251,7 @@ instance (Monad m) => TreeRW (TreeMonad m) where - let item = find tr from' - found_to = find tr to' - unless (isNothing found_to) $ -- fail $ "Error renaming: destination " ++ show to ++ " exists." -+ error $ "Error renaming: destination " ++ show to ++ " exists." - unless (isNothing item) $ do - modifyItem from Nothing - modifyItem to item --- -2.23.1 - diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/darcs-setup.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/darcs-setup.patch deleted file mode 100644 index fbc7efde42..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/darcs-setup.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- darcs-2.14.2/Setup.hs 2019-01-27 03:14:51.000000000 +1300 -+++ darcs.net/Setup.hs 2019-10-18 02:41:57.000000000 +1300 -@@ -11,7 +11,9 @@ - , TestSuite(testBuildInfo) - , updatePackageDescription - , cppOptions, ccOptions -- , library, libBuildInfo, otherModules ) -+ , library, libBuildInfo, otherModules -+ , ComponentName(CExeName) -+ ) - import Distribution.Package - ( packageVersion ) - import Distribution.Version( Version ) -@@ -21,24 +23,27 @@ - import Distribution.Simple.Setup - (buildVerbosity, copyDest, copyVerbosity, fromFlag, - haddockVerbosity, installVerbosity, sDistVerbosity, replVerbosity ) --import Distribution.Simple.BuildPaths ( autogenModulesDir ) -+import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) - import Distribution.System - ( OS(Windows), buildOS ) - import Distribution.Simple.Utils - (copyFiles, createDirectoryIfMissingVerbose, rawSystemStdout, -- rewriteFile ) -+ rewriteFileEx) -+import Distribution.Types.UnqualComponentName - import Distribution.Verbosity -- ( Verbosity ) -+ ( Verbosity, silent ) - import Distribution.Text - ( display ) --import Control.Monad ( unless, void ) - -+import Control.Monad ( unless, when, void ) - import System.Directory - ( doesDirectoryExist, doesFileExist ) - import System.IO - ( openFile, IOMode(..) ) - import System.Process (runProcess) - import Data.List( isInfixOf, lines ) -+import qualified Data.Map as M -+import Data.Maybe ( isJust ) - import System.FilePath ( () ) - import Foreign.Marshal.Utils ( with ) - import Foreign.Storable ( peek ) -@@ -75,8 +80,8 @@ - verb = fromFlag $ sDistVerbosity flags - x <- versionPatches verb pkgVer - y <- context verb -- rewriteFile "release/distributed-version" $ show x -- rewriteFile "release/distributed-context" $ show y -+ rewriteFileEx silent "release/distributed-version" $ show x -+ rewriteFileEx silent "release/distributed-context" $ show y - putStrLn "about to hand over" - let pkg' = pkg { library = sanity (library pkg) } - sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } -@@ -105,8 +110,7 @@ - littleEndian <- testEndianness - let args = ("-DPACKAGE_VERSION=" ++ show' version) : - [arg | (arg, True) <- -- include fst iff snd. -- [-- We have MAPI iff building on/for Windows. -- ("-DHAVE_MAPI", buildOS == Windows), -+ [ - ("-DLITTLEENDIAN", littleEndian), - ("-DBIGENDIAN", not littleEndian)]] - bi = emptyBuildInfo { cppOptions = args, ccOptions = args } -@@ -133,20 +137,26 @@ - -- man page - -- --------------------------------------------------------------------- - -+hasDarcsExe :: LocalBuildInfo -> Bool -+hasDarcsExe = isJust . M.lookup darcsExe . componentNameMap where -+ darcsExe = CExeName (mkUnqualComponentName "darcs") -+ - buildManpage :: LocalBuildInfo -> IO () --buildManpage lbi = do -- let darcs = buildDir lbi "darcs/darcs" -- manpage = buildDir lbi "darcs/darcs.1" -- manpageHandle <- openFile manpage WriteMode -- void $ runProcess darcs ["help","manpage"] -- Nothing Nothing Nothing (Just manpageHandle) Nothing -+buildManpage lbi = -+ when (hasDarcsExe lbi) $ do -+ let darcs = buildDir lbi "darcs/darcs" -+ manpage = buildDir lbi "darcs/darcs.1" -+ manpageHandle <- openFile manpage WriteMode -+ void $ runProcess darcs ["help","manpage"] -+ Nothing Nothing Nothing (Just manpageHandle) Nothing - --installManpage :: PackageDescription -> LocalBuildInfo -- -> Verbosity -> CopyDest -> IO () -+installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO () - installManpage pkg lbi verbosity copy = -- copyFiles verbosity -- (mandir (absoluteInstallDirs pkg lbi copy) "man1") -- [(buildDir lbi "darcs", "darcs.1")] -+ when (hasDarcsExe lbi) $ -+ copyFiles -+ verbosity -+ (mandir (absoluteInstallDirs pkg lbi copy) "man1") -+ [(buildDir lbi "darcs", "darcs.1")] - - -- --------------------------------------------------------------------- - -- version module -@@ -187,12 +197,13 @@ - generateVersionModule :: Verbosity -> LocalBuildInfo - -> String -> String -> IO () - generateVersionModule verbosity lbi version state = do -- let dir = autogenModulesDir lbi -+ let dir = autogenPackageModulesDir lbi - createDirectoryIfMissingVerbose verbosity True dir - ctx <- context verbosity - hash <- weakhash verbosity -- rewriteFile (dir "Version.hs") $ unlines -+ rewriteFileEx silent (dir "Version.hs") $ unlines - ["module Version where" -+ ,"import Darcs.Prelude" - ,"version, weakhash, context :: String" - ,"version = \"" ++ version ++ " (" ++ state ++ ")\"" - ,"weakhash = " ++ case hash of diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch deleted file mode 100644 index 7ed390d3f2..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch +++ /dev/null @@ -1,383 +0,0 @@ -Only in dbus-1.2.13-new: .codeclimate.yml -diff -ur dbus-1.2.13-old/dbus.cabal dbus-1.2.13-new/dbus.cabal ---- dbus-1.2.13-old/dbus.cabal 2020-04-25 19:29:27.372272952 +0200 -+++ dbus-1.2.13-new/dbus.cabal 2020-04-25 19:26:36.140991920 +0200 -@@ -1,172 +1,180 @@ --cabal-version: >=1.8 - name: dbus - version: 1.2.13 - license: Apache-2.0 - license-file: license.txt --maintainer: Andrey Sverdlichenko - author: John Millikin -+maintainer: Andrey Sverdlichenko -+build-type: Simple -+cabal-version: >= 1.8 -+category: Network, Desktop - stability: experimental - homepage: https://github.com/rblaze/haskell-dbus#readme -+ - synopsis: A client library for the D-Bus IPC system. - description: -- D-Bus is a simple, message-based protocol for inter-process -- communication, which allows applications to interact with other parts of -- the machine and the user's session using remote procedure calls. -- . -- D-Bus is a essential part of the modern Linux desktop, where it replaces -- earlier protocols such as CORBA and DCOP. -- . -- This library is an implementation of the D-Bus protocol in Haskell. It -- can be used to add D-Bus support to Haskell applications, without the -- awkward interfaces common to foreign bindings. -- . -- Example: connect to the session bus, and get a list of active names. -- . -- @ -- {-\# LANGUAGE OverloadedStrings \#-} -- . -- import Data.List (sort) -- import DBus -- import DBus.Client -- . -- main = do -- client <- connectSession -- // -- \-- Request a list of connected clients from the bus -- reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") -- { methodCallDestination = Just \"org.freedesktop.DBus\" -- } -- // -- \-- org.freedesktop.DBus.ListNames() returns a single value, which is -- \-- a list of names (here represented as [String]) -- let Just names = fromVariant (methodReturnBody reply !! 0) -- // -- \-- Print each name on a line, sorted so reserved names are below -- \-- temporary names. -- mapM_ putStrLn (sort names) -- @ -- . -- >$ ghc --make list-names.hs -- >$ ./list-names -- >:1.0 -- >:1.1 -- >:1.10 -- >:1.106 -- >:1.109 -- >:1.110 -- >ca.desrt.dconf -- >org.freedesktop.DBus -- >org.freedesktop.Notifications -- >org.freedesktop.secrets -- >org.gnome.ScreenSaver --category: Network, Desktop --build-type: Simple -+ D-Bus is a simple, message-based protocol for inter-process -+ communication, which allows applications to interact with other parts of -+ the machine and the user's session using remote procedure calls. -+ . -+ D-Bus is a essential part of the modern Linux desktop, where it replaces -+ earlier protocols such as CORBA and DCOP. -+ . -+ This library is an implementation of the D-Bus protocol in Haskell. It -+ can be used to add D-Bus support to Haskell applications, without the -+ awkward interfaces common to foreign bindings. -+ . -+ Example: connect to the session bus, and get a list of active names. -+ . -+ @ -+ {-\# LANGUAGE OverloadedStrings \#-} -+ . -+ import Data.List (sort) -+ import DBus -+ import DBus.Client -+ . -+ main = do -+ client <- connectSession -+ -+ -- Request a list of connected clients from the bus -+ reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") -+ { methodCallDestination = Just \"org.freedesktop.DBus\" -+ } -+ -+ -- org.freedesktop.DBus.ListNames() returns a single value, which is -+ -- a list of names (here represented as [String]) -+ let Just names = fromVariant (methodReturnBody reply !! 0) -+ -+ -- Print each name on a line, sorted so reserved names are below -+ -- temporary names. -+ mapM_ putStrLn (sort names) -+ @ -+ . -+ >$ ghc --make list-names.hs -+ >$ ./list-names -+ >:1.0 -+ >:1.1 -+ >:1.10 -+ >:1.106 -+ >:1.109 -+ >:1.110 -+ >ca.desrt.dconf -+ >org.freedesktop.DBus -+ >org.freedesktop.Notifications -+ >org.freedesktop.secrets -+ >org.gnome.ScreenSaver -+ -+ - extra-source-files: -- examples/dbus-monitor.hs -- examples/export.hs -- examples/introspect.hs -- examples/list-names.hs -- idlxml/dbus.xml -+ examples/dbus-monitor.hs -+ examples/export.hs -+ examples/introspect.hs -+ examples/list-names.hs -+ idlxml/dbus.xml - - source-repository head -- type: git -- location: https://github.com/rblaze/haskell-dbus -+ type: git -+ location: https://github.com/rblaze/haskell-dbus - - library -- exposed-modules: -- DBus -- DBus.Client -- DBus.Generation -- DBus.Internal.Address -- DBus.Internal.Message -- DBus.Internal.Types -- DBus.Internal.Wire -- DBus.Introspection -- DBus.Introspection.Parse -- DBus.Introspection.Render -- DBus.Introspection.Types -- DBus.Socket -- DBus.TH -- DBus.Transport -- hs-source-dirs: lib -- ghc-options: -W -Wall -- build-depends: -- base ==4.*, -- bytestring <0.11, -- cereal <0.6, -- conduit >=1.3.0 && <1.4, -- containers <0.7, -- deepseq <1.5, -- exceptions <0.11, -- filepath <1.5, -- lens <4.20, -- network >=3.0.1.0 && <3.2, -- parsec <3.2, -- random <1.2, -- split <0.3, -- template-haskell <2.16.0.0, -- text <1.3, -- th-lift <0.9, -- transformers <0.6, -- unix <2.8, -- vector <0.13, -- xml-conduit >=1.9.0.0 && <1.10.0.0, -- xml-types <0.4 -+ ghc-options: -W -Wall -+ hs-source-dirs: lib -+ -+ build-depends: -+ base >=4 && <5 -+ , bytestring -+ , cereal -+ , conduit >= 1.3.0 -+ , containers -+ , deepseq -+ , exceptions -+ , filepath -+ , lens < 4.20 -+ , network >= 3.0.1.0 && < 3.2 -+ , parsec -+ , random -+ , split -+ , template-haskell < 2.17.0.0 -+ , text -+ , th-lift < 0.9 -+ , transformers -+ , unix -+ , vector -+ , xml-conduit >= 1.9.0.0 && < 1.10.0.0 -+ , xml-types -+ -+ exposed-modules: -+ DBus -+ DBus.Client -+ DBus.Generation -+ DBus.Internal.Address -+ DBus.Internal.Message -+ DBus.Internal.Types -+ DBus.Internal.Wire -+ DBus.Introspection -+ DBus.Introspection.Parse -+ DBus.Introspection.Render -+ DBus.Introspection.Types -+ DBus.Socket -+ DBus.TH -+ DBus.Transport - - test-suite dbus_tests -- type: exitcode-stdio-1.0 -- main-is: DBusTests.hs -- hs-source-dirs: tests -- other-modules: -- DBusTests.Address -- DBusTests.BusName -- DBusTests.Client -- DBusTests.ErrorName -- DBusTests.Generation -- DBusTests.Integration -- DBusTests.InterfaceName -- DBusTests.Introspection -- DBusTests.MemberName -- DBusTests.Message -- DBusTests.ObjectPath -- DBusTests.Serialization -- DBusTests.Signature -- DBusTests.Socket -- DBusTests.TH -- DBusTests.Transport -- DBusTests.Util -- DBusTests.Variant -- DBusTests.Wire -- ghc-options: -W -Wall -fno-warn-orphans -- build-depends: -- dbus -any, -- base ==4.*, -- bytestring <0.11, -- cereal <0.6, -- containers <0.7, -- directory <1.4, -- extra <1.8, -- filepath <1.5, -- network >=3.0.1.0 && <3.2, -- parsec <3.2, -- process <1.7, -- QuickCheck <2.15, -- random <1.2, -- resourcet <1.3, -- tasty <1.3, -- tasty-hunit <0.11, -- tasty-quickcheck <0.11, -- text <1.3, -- transformers <0.6, -- unix <2.8, -- vector <0.13 -+ type: exitcode-stdio-1.0 -+ main-is: DBusTests.hs -+ hs-source-dirs: tests -+ ghc-options: -W -Wall -fno-warn-orphans -+ -+ build-depends: -+ dbus -+ , base >=4 && <5 -+ , bytestring -+ , cereal -+ , containers -+ , directory -+ , extra < 1.8 -+ , filepath -+ , network >= 3.0.1.0 && < 3.2 -+ , parsec -+ , process -+ , QuickCheck < 2.15 -+ , random -+ , resourcet -+ , tasty -+ , tasty-hunit -+ , tasty-quickcheck -+ , text -+ , transformers -+ , unix -+ , vector -+ -+ other-modules: -+ DBusTests.Address -+ DBusTests.BusName -+ DBusTests.Client -+ DBusTests.ErrorName -+ DBusTests.Generation -+ DBusTests.Integration -+ DBusTests.InterfaceName -+ DBusTests.Introspection -+ DBusTests.MemberName -+ DBusTests.Message -+ DBusTests.ObjectPath -+ DBusTests.Serialization -+ DBusTests.Signature -+ DBusTests.Socket -+ DBusTests.TH -+ DBusTests.Transport -+ DBusTests.Util -+ DBusTests.Variant -+ DBusTests.Wire - - benchmark dbus_benchmarks -- type: exitcode-stdio-1.0 -- main-is: DBusBenchmarks.hs -- hs-source-dirs: benchmarks -- ghc-options: -Wall -fno-warn-orphans -- build-depends: -- dbus -any, -- base ==4.*, -- criterion <1.6 -+ type: exitcode-stdio-1.0 -+ main-is: DBusBenchmarks.hs -+ hs-source-dirs: benchmarks -+ ghc-options: -Wall -fno-warn-orphans -+ -+ build-depends: -+ dbus -+ , base >=4 && <5 -+ , criterion -Only in dbus-1.2.13-new: .git -Only in dbus-1.2.13-new: .gitignore -diff -ur dbus-1.2.13-old/lib/DBus/Generation.hs dbus-1.2.13-new/lib/DBus/Generation.hs ---- dbus-1.2.13-old/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 -+++ dbus-1.2.13-new/lib/DBus/Generation.hs 2020-04-25 19:26:36.144991997 +0200 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - {-# LANGUAGE OverloadedStrings #-} - {-# LANGUAGE TemplateHaskell #-} - module DBus.Generation where -@@ -26,6 +27,13 @@ - import Prelude hiding (mapM) - import System.Posix.Types (Fd(..)) - -+-- | Compatibility helper to create (total) tuple expressions -+mkTupE :: [Exp] -> Exp -+mkTupE = TupE -+#if MIN_VERSION_template_haskell(2,16,0) -+ . map Just -+#endif -+ - type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a - - dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a -@@ -232,8 +240,8 @@ - finalOutputNames <- buildOutputNames - let variantListExp = map makeToVariantApp methodArgNames - mapOrHead' = mapOrHead outputLength -- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE -- finalResultTuple = mapOrHead' VarE finalOutputNames TupE -+ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE -+ finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE - maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP - getMethodCallDefDec = [d| - $( varP methodCallDefN ) = -@@ -432,7 +440,7 @@ - } - |] - let mapOrHead' = mapOrHead argCount -- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE -+ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE - maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP - applyToName toApply n = AppE toApply $ VarE n - finalApplication = foldl applyToName (VarE handlerArgN) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch deleted file mode 100644 index 48cf6a035a..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/GHC/Paths.hs b/GHC/Paths.hs -index c87565d..88b3db4 100644 ---- a/GHC/Paths.hs -+++ b/GHC/Paths.hs -@@ -1,13 +1,35 @@ - {-# LANGUAGE CPP #-} -+{-# LANGUAGE ScopedTypeVariables #-} - - module GHC.Paths ( - ghc, ghc_pkg, libdir, docdir - ) where - -+import Control.Exception as E -+import Data.Maybe -+import System.Environment -+import System.IO.Unsafe -+ -+-- Yes, there's lookupEnv now, but we want to be compatible -+-- with older GHCs. -+checkEnv :: String -> IO (Maybe String) -+checkEnv var = E.catch (fmap Just (getEnv var)) -+ (\ (e :: IOException) -> return Nothing) -+ -+nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath -+nixLibdir = unsafePerformIO (checkEnv "NIX_GHCJS_LIBDIR") -+nixDocdir = unsafePerformIO (checkEnv "NIX_GHCJS_DOCDIR") -+nixGhc = unsafePerformIO (checkEnv "NIX_GHCJS") -+nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCJSPKG") -+{-# NOINLINE nixLibdir #-} -+{-# NOINLINE nixDocdir #-} -+{-# NOINLINE nixGhc #-} -+{-# NOINLINE nixGhcPkg #-} -+ - libdir, docdir, ghc, ghc_pkg :: FilePath - --libdir = GHC_PATHS_LIBDIR --docdir = GHC_PATHS_DOCDIR -+libdir = fromMaybe GHC_PATHS_LIBDIR nixLibdir -+docdir = fromMaybe GHC_PATHS_DOCDIR nixDocdir - --ghc = GHC_PATHS_GHC --ghc_pkg = GHC_PATHS_GHC_PKG -+ghc = fromMaybe GHC_PATHS_GHC nixGhc -+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg -diff --git a/Setup.hs b/Setup.hs -index f2d1733..ca4792e 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -39,13 +39,13 @@ main = defaultMainWithHooks simpleUserHooks { - #else - libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) - #endif -- ghcProgram (withPrograms lbi) ["--print-libdir"] -+ ghcjsProgram (withPrograms lbi) ["--print-libdir"] - let libdir = reverse $ dropWhile isSpace $ reverse libdir_ - -- ghc_pkg = case lookupProgram ghcPkgProgram (withPrograms lbi) of -+ ghc_pkg = case lookupProgram ghcjsPkgProgram (withPrograms lbi) of - Just p -> programPath p - Nothing -> error "ghc-pkg was not found" -- ghc = case lookupProgram ghcProgram (withPrograms lbi) of -+ ghc = case lookupProgram ghcjsProgram (withPrograms lbi) of - Just p -> programPath p - Nothing -> error "ghc was not found" - diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hunspell.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hunspell.patch deleted file mode 100644 index cc115029a7..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hunspell.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal ---- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal 2018-08-26 20:23:33.053763300 +0200 -+++ hunspell-hs-0.1.0.0/hunspell-hs.cabal 2018-08-26 20:42:05.886074510 +0200 -@@ -37,7 +37,7 @@ - base >=4.7 && <5 - , stm - if os(linux) -- extra-libraries: -+ pkgconfig-depends: - hunspell - if os(darwin) - include-dirs: -@@ -63,7 +63,7 @@ - , hunspell-hs - , stm - if os(linux) -- extra-libraries: -+ pkgconfig-depends: - hunspell - if os(darwin) - include-dirs: -@@ -88,7 +88,7 @@ - , hunspell-hs - , stm - if os(linux) -- extra-libraries: -+ pkgconfig-depends: - hunspell - if os(darwin) - include-dirs: diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index d50ed8ff05..f8fb244d54 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.1.172"; + version = "1.1.173"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM="; + sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI="; }; executable = "bb"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix index cddb773ec1..489d3b0128 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix @@ -15,10 +15,14 @@ stdenv.mkDerivation rec { substituteInPlace setup.ml --replace js_of_ocaml.ocamlbuild js_of_ocaml-ocamlbuild ''; - buildInputs = [ which ] ++ (with ocamlPackages; [ - ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild + strictDeps = true; + + nativeBuildInputs = [ which ] ++ (with ocamlPackages; [ + ocaml findlib ocamlbuild menhir ]); + buildInputs = with ocamlPackages; [ js_of_ocaml js_of_ocaml-ocamlbuild ]; + doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix index 6cfda280d3..4bddae374a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.14"; - hash = "sha256-FMqZMz3WBKUEojaJRkhaw103nE2pbSjcUV1+tQLf+jI="; + version = "8.1.15"; + hash = "sha256-GNoKlCKPQgf4uePiPogfK3TQ1srvuQi9tYY9SgEDXMY="; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix index 41627582dc..d37daff237 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.1"; - hash = "sha256-ddb482WZPsDR2cYoHUVX5v7sWiYZSkaLiwFFnRd++yk="; + version = "8.2.2"; + hash = "sha256-9SI6UnTtqLQMGeR94N5GeMZdZEAcz3EOJGSWLrgTaAQ="; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 005858d31e..66566cf5c2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -345,6 +345,8 @@ in with passthru; stdenv.mkDerivation { "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [ + "--with-build-python=${pythonForBuildInterpreter}" ] ++ optionals stdenv.hostPlatform.isLinux [ # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index bb709694dc..0f0a3f5e67 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -312,8 +312,8 @@ in { inherit passthruFun; }; - rustpython = callPackage ./rustpython/default.nix { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + rustpython = darwin.apple_sdk_11_0.callPackage ./rustpython/default.nix { + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; }) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix index a7c6c8d842..e3e2ca8c18 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix @@ -31,14 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://rustpython.github.io"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; - - # TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions. - # Probably macOS SDK 10.13 or later. Check the current version in - # .../os-specific/darwin/apple-sdk/default.nix - # - # From the build logs: - # - # > Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix index 577f4c0fcf..03f6fb31cb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -3,6 +3,7 @@ , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp , gtk3 +, glibcLocales , libedit, libffi , libiconv , libGL @@ -49,7 +50,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.7"; # always change at once with ./minimal.nix + version = "8.8"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "sha256-dqfmbUfnPrDcP8on/IGONuHUv/502iY8Xv47iAGjCgE="; + sha256 = "sha256-OYQi4rQjc+FOTg+W2j2Vy1dEJHuj9z6pmBX7aTwnFKs="; }; FONTCONFIG_FILE = fontsConf; @@ -107,6 +108,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) + gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") '' + lib.optionalString stdenv.isDarwin '' gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index 9ddaa0f141..c52869344a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix @@ -6,7 +6,7 @@ racket.overrideAttrs (oldAttrs: rec { version = oldAttrs.version; src = oldAttrs.src.override { name = "${pname}-${version}"; - sha256 = "sha256-Iy7ZzxfNf3Q7LM9z13XsNbWvJrJeVREprrYDi7DNwOw="; + sha256 = "sha256-KaYT1PzHtGYej3CZEnensGiFaR9+487XueiZf3e+hQU="; }; meta = oldAttrs.meta // { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index cfdeac264c..efd08f7d85 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.14.6"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-3FRzqHbzNhmYg3wRvajMzTWB7lOlgrxwQvvnB3fggGM="; + sha256 = "sha256-MJKG/8b8l2RqWec5JoWcYLYrEKI9zrhJMyLqVcvAY+g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index b2844f723b..30a4244e4f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Vw3+KlAuCQiyBfPOZrUotgrdkG+FRjXg8AxAanfbwJQ="; + hash = "sha256-tHGzXjOOOWgYBMA0skLRNFkVgXc3hcs3F1XNsHxDRhk="; fetchSubmodules = true; }; - cargoHash = "sha256-gV3Yf7YL3D3hrymYW1b80uOlp7RYRWFC7GtxAot5Ut0="; + cargoHash = "sha256-92BZdbNz22cZMJkHJwE3lUik6hAhRLCBwYzm2RAvRGo="; cargoBuildFlags = [ "--package wasmtime-cli" @@ -28,14 +28,8 @@ rustPlatform.buildRustPackage rec { # false positives of this package being broken due to failed runs on # Hydra (e.g. https://hydra.nixos.org/build/187667794/) doCheck = (stdenv.system != "x86_64-darwin"); - checkFlags = [ - "--skip=cli_tests::run_cwasm" - "--skip=commands::compile::test::test_unsupported_flags_compile" - "--skip=commands::compile::test::test_aarch64_flags_compile" - "--skip=commands::compile::test::test_successful_compile" - "--skip=commands::compile::test::test_x64_flags_compile" - "--skip=commands::compile::test::test_x64_presets_compile" - "--skip=traps::parse_dwarf_info" + cargoTestFlags = [ + "--package wasmtime-runtime" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix index 4ff02ffb7b..a8824904ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix @@ -1,15 +1,20 @@ { lib, stdenv, fetchurl , pkg-config , SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation +, version ? "2.6.3" +, hash ? "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=" }: -stdenv.mkDerivation rec { +let pname = "SDL2_image"; - version = "2.0.5"; +in + +stdenv.mkDerivation { + inherit pname version; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; - sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch b/third_party/nixpkgs/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch new file mode 100644 index 0000000000..4bacb891f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch @@ -0,0 +1,14 @@ +based onhttps://830833.bugs.gentoo.org/attachment.cgi?id=761676, +adjusted for 1.7.2 + +--- a/configure.in 2022-01-09 00:31:05.552582255 -0800 ++++ b/configure.in 2022-01-09 00:31:19.824582533 -0800 +@@ -1329,7 +1329,7 @@ + return 3; + } + return 0; +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])]) ++ }], [], [ac_cv_file__dev_zero=no], [:])]) + fi + + # Now we determine which one is our anonymous shmem preference. diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apr/default.nix index 0d980db9b5..36a82afcf8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apr/default.nix @@ -2,38 +2,15 @@ stdenv.mkDerivation rec { pname = "apr"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; - sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; + sha256 = "sha256-ded8yGd2wDDApcQI370L8qC3Xu1TUeUtVDn6HlUJpD4="; }; patches = [ - (fetchpatch { - name = "CVE-2021-35940.patch"; - url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch"; - sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs"; - # convince fetchpatch to restore missing `a/`, `b/` to paths - extraPrefix = ""; - }) - - # Fix cross. - (fetchpatch { - url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch"; - sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y"; - }) - (fetchpatch { - url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; - sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; - }) - - # Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833 - (fetchpatch { - url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676"; - name = "cross-assume-dev-zero-mmappable.patch"; - sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8="; - }) + ./cross-assume-dev-zero-mmappable.patch ]; # This test needs the net diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix index dd76917625..7837fad283 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.22"; + version = "0.8.24"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI="; + sha256 = "sha256-2d2CZzRfVr45gfgIg43Rr+1SoVIxzy8YjaQJhwi5owE="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 3d5d973eec..fc5162b34e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; - version = "0.5.1"; + version = "0.6.1"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-zyAKaO22She1e/+zPjiwSHeCctGLVYnT0vWgHODzSwc="; + sha256 = "sha256-iil6zj16R0Ex7T+jIQacExM3eFtWojfW8WjIXueW1Ww="; }; buildInputs = [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix index 5203e941b3..e2658423ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bullet"; - version = "3.24"; + version = "3.25"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "sha256-1zQZI1MdW0Ipg5XJeiFZQi/6cI0t6Ckralc5DE3auow="; + sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index 8640fb6b5c..f05f55cd8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.18.5"; + version = "0.18.7"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "04b4kjisb5wzq6pilh8xzbxn7qcjgppl8k65hfv0zi0ja8fyp1xk"; + hash = "sha256-y1RE6AnyOrUN/z4md/xjlVwlIcL97ZEcKEOf8ZsCf+U="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index c1e7b52c04..ee8e436d29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -8,11 +8,14 @@ , libGL # libGLU libGL is no longer a big dependency , pdfSupport ? true , darwin +, testers }: let inherit (lib) optional optionals; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) pname version; +in { pname = "cairo"; version = "1.16.0"; @@ -132,6 +135,8 @@ in stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' @@ -147,6 +152,11 @@ in stdenv.mkDerivation rec { ''; homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; + pkgConfigModules = [ + "cairo-ps" + "cairo-svg" + ] ++ lib.optional gobjectSupport "cairo-gobject" + ++ lib.optional pdfSupport "cairo-gobject"; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix index 853b1d7d59..38b025d8dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-f/tM8b2JGZw2OzhlhMvjzLjgvgj5qncEepYsEwSxeAI="; + hash = "sha256-JVxBYhKTejc8lfqgxz5Ig5G9H90YuIcGAUopGJG/3Dg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix index bd89b18dc7..1d89025a51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u8UmJ4bu00t7qxiNZ3nL7cd+8AIC0LoICj5FNPboCTQ="; + sha256 = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix index ab354b836b..4b02b11b3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -16,17 +16,23 @@ let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation rec { - version = "1.5.5"; + version = "1.5.6"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - sha256 = "sha256-WYWEUfBPz/Pt7sE8snG3/LnOA3DEUm/SUVLtsH7zG5g="; + hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI="; fetchSubmodules = true; }; + # ld: unknown option: --start-group + postPatch = '' + substituteInPlace cmake/draco_targets.cmake \ + --replace "^Clang" "^AppleClang" + ''; + buildInputs = [ gtest ] ++ lib.optionals withTranscoder [ eigen ghc_filesystem tinygltf ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix index d17ca4ea75..54bab95992 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "exempi"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0="; + sha256 = "sha256-sHSdsYqeeM93FzeVSoOM3NsdVBWIi6wbqcr4y6d8ZWw="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index b658cece4d..f0c6924995 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.01"; + version = "23.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-/XfwQUkhn82vAKa7ZyiPbD4c7XJhCIncxvWkj/m2P0M="; + sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY="; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix index c5edb59262..9d83fdb487 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -12,18 +12,19 @@ , enableMpi ? false , mpi , withDoc ? stdenv.cc.isGNU +, testers }: assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fftw-${precision}"; version = "3.3.10"; src = fetchurl { urls = [ - "https://fftw.org/fftw-${version}.tar.gz" - "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" + "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" + "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" ]; sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; @@ -60,11 +61,21 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ perl ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Fastest Fourier Transform in the West library"; homepage = "http://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; + pkgConfigModules = [ + { + "single" = "fftw3f"; + "double" = "fftw3"; + "long-double" = "fftw3l"; + "quad-precision" = "fftw3q"; + }.${precision} + ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index 323a9a2f8b..78d280b991 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.11.28.00"; + version = "2023.01.30.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-TI3uMlkssKtTvxqj9Et12aAjbHoV9FVBvrZr7oCFlIo="; + sha256 = "sha256-p5IAbXPUrGtJotwabpEShNsUZNeF6ncHbDXaNabdaaY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix new file mode 100644 index 0000000000..c764b097b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "functionalplus"; + version = "0.2.18-p0"; + + src = fetchFromGitHub { + owner = "Dobiasd"; + repo = "FunctionalPlus"; + rev = "v${version}"; + sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Functional Programming Library for C++"; + homepage = "https://github.com/Dobiasd/FunctionalPlus"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix index dd7852ac55..3eacad32f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix @@ -1,18 +1,26 @@ -{ lib, stdenv, fetchurl -, withShishi ? !stdenv.isDarwin, shishi +{ lib +, stdenv +, fetchurl +, withShishi ? !stdenv.isDarwin +, shishi }: stdenv.mkDerivation rec { pname = "gss"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://gnu/gss/gss-${version}.tar.gz"; - sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; + hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM="; }; buildInputs = lib.optional withShishi shishi; + # ./stdint.h:89:5: error: expected value in expression + preConfigure = lib.optionalString stdenv.isDarwin '' + export GNULIBHEADERS_OVERRIDE_WINT_T=0 + ''; + configureFlags = [ "--${if withShishi then "enable" else "disable"}-kerberos5" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix index fc9fc1da08..9145420ad2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.2"; + version = "1.6.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6QBZzIOAXa2T6DvkflOVjwdHHMRk+UQ5HntcgqpRoY8="; + sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 37a282c4cc..c4604a28a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -44,13 +45,23 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.2"; + version = "1.50.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4="; + sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0="; }; + patches = [ + # Hardcode the ssh path again. + # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch"; + hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8="; + revert = true; + }) + ]; + postPatch = '' # patchShebangs requires executable file chmod +x meson_post_install.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 5e6f628aa6..11cd887729 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.6.5"; + version = "23.1.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-W+lDqGZAenhRZ7tf4qfDNik/3rFNDM0DGSK/CdNRb8g="; + sha256 = "sha256-FTyjIWYKXFAzu3SR1EGN+aTzVbX617o/KWCD/DGv69o="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix index cbdaf1da89..beec3e13cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ilmbase, karchive, openexr, libavif, libheif, qtbase + ilmbase, karchive, openexr, libavif, libheif, libjxl, libraw, qtbase }: let inherit (lib) getDev; in @@ -10,7 +10,7 @@ mkDerivation { pname = "kimageformats"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive openexr libavif libheif qtbase ]; + buildInputs = [ karchive openexr libavif libheif libjxl libraw qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix index 9df992a576..8e68ea3f9c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix @@ -1,5 +1,3 @@ -# TODO: Resolve the issues with the Mono bindings. - { stdenv, fetchgit, lib , pkg-config, autoreconfHook , glib, dbus-glib @@ -7,11 +5,16 @@ , gtk2, libindicator-gtk2, libdbusmenu-gtk2 , gtk3, libindicator-gtk3, libdbusmenu-gtk3 , gtk-doc, vala, gobject-introspection -, monoSupport ? false, mono, gtk-sharp-2_0 - }: +, monoSupport ? false, mono, gtk-sharp-2_0, gtk-sharp-3_0 +, testers +}: -stdenv.mkDerivation { - pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; +let + throwBadGtkVersion = throw "unknown GTK version ${gtkVersion}"; +in + +stdenv.mkDerivation (finalAttrs: { + pname = let postfix = if monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; @@ -25,16 +28,24 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ]; - propagatedBuildInputs = - if gtkVersion == "2" - then [ gtk2 libdbusmenu-gtk2 ] - else [ gtk3 libdbusmenu-gtk3 ]; + propagatedBuildInputs = { + "2" = [ gtk2 libdbusmenu-gtk2 ]; + "3" = [ gtk3 libdbusmenu-gtk3 ]; + }.${gtkVersion} or throwBadGtkVersion; buildInputs = [ glib dbus-glib - ] ++ (if gtkVersion == "2" - then [ libindicator-gtk2 ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ] - else [ libindicator-gtk3 ]); + { + "2" = libindicator-gtk2; + "3" = libindicator-gtk3; + }.${gtkVersion} or throwBadGtkVersion + ] ++ lib.optionals monoSupport [ + mono + { + "2" = gtk-sharp-2_0; + "3" = gtk-sharp-3_0; + }.${gtkVersion} or throwBadGtkVersion + ]; preAutoreconf = '' gtkdocize @@ -54,11 +65,19 @@ stdenv.mkDerivation { "localstatedir=\${TMPDIR}" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A library to allow applications to export a menu into the Unity Menu bar"; homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; + pkgConfigModules = { + "2" = [ "appindicator-0.1" ]; + "3" = [ "appindicator3-0.1" ]; + }.${gtkVersion} or throwBadGtkVersion; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; + # TODO: Resolve the issues with the Mono bindings. + broken = monoSupport; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix index 36b591b060..bd39cfb71c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ ]; mainProgram = "cd-paranoia"; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index 34440d6781..1eda49ad3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , meson @@ -23,25 +22,15 @@ stdenv.mkDerivation rec { pname = "libchamplain"; - version = "0.12.20"; + version = "0.12.21"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; + sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac="; }; - patches = lib.optionals withLibsoup3 [ - # Port to libsoup3 - # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; - excludes = [ ".gitlab-ci.yml" ]; - sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; - }) - ]; - - outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja @@ -68,6 +57,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Dvapi=true" + (lib.mesonBool "libsoup3" withLibsoup3) ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix index 7b0fca8583..9efea659a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix @@ -3,13 +3,16 @@ , glib, dbus-glib, json-glib , gobject-introspection, vala , gtkVersion ? null, gtk2, gtk3 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; version = "16.04.0"; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; @@ -18,7 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib json-glib - ] ++ lib.optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); + ] ++ lib.optional (gtkVersion != null) + { + "2" = gtk2; + "3" = gtk3; + }.${gtkVersion} or (throw "unknown GTK version ${gtkVersion}"); postPatch = '' for f in {configure,ltmain.sh,m4/libtool.m4}; do @@ -37,6 +44,7 @@ stdenv.mkDerivation rec { "CFLAGS=-Wno-error" "--sysconfdir=/etc" "--localstatedir=/var" + # TODO use `lib.withFeatureAs` (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}") "--disable-scrollkeeper" ] ++ lib.optional (gtkVersion != "2") "--disable-dumper"; @@ -49,11 +57,17 @@ stdenv.mkDerivation rec { "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Library for passing menu structures across DBus"; homepage = "https://launchpad.net/dbusmenu"; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; + pkgConfigModules = [ + "dbusmenu-glib-0.4" + "dbusmenu-jsonloader-0.4" + ] ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4"; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 7d8b1c9569..f92f20f1ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.107.0"; + version = "1.107.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; + hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; + hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix index 35637512e0..0cba50c3a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix @@ -13,16 +13,17 @@ , OpenGL , runtimeShell , withXorg ? true +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdevil"; version = "1.7.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz"; + url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; @@ -63,11 +64,14 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://openil.sourceforge.net/"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; + pkgConfigModules = [ "IL" ]; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index 9384a7c976..6fe2f398b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.7.12"; + version = "0.8"; src = fetchFromGitHub { owner = "pantoniou"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gmVjiwf8PsDYRt8jmXNrd+hJSL099hbLjq8Z0c1u2HE="; + hash = "sha256-b/jRKe23NIVSydoczI+Ax2VjBJLfAEwF8SW61vIDTwA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + outputs = [ "bin" "dev" "out" "man" ]; + doCheck = true; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 0af6a910a5..ced064e70f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.8.0"; + version = "1.8.1"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bCVCwFeJJLDCm3rmy0TrJt846wHW1e89fQsIJXYyMOg="; + sha256 = "sha256-N2a5qIH+BljMYIBFOiIZCGw/bb2CBp3kCbirP1mUinA="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix index 8ecb6c6d96..5d008f394e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -10,6 +10,7 @@ , libpng , libjpeg , libaom +, gdk-pixbuf # for passthru.tests , gimp @@ -32,11 +33,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + dav1d + rav1e + libde265 + x265 + libpng + libjpeg + libaom + gdk-pixbuf + ]; enableParallelBuilding = true; + # Fix installation path for gdk-pixbuf module + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; + passthru.tests = { inherit gimp imagemagick imlib2Full imv vips; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix index f1b6d18a86..56a8e59433 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix @@ -6,17 +6,18 @@ , pkg-config , libuuid , openssl +, libossp_uuid }: stdenv.mkDerivation rec { pname = "libks"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bfp8+jqXu1utlaYuPewm+t3zHxaTWEw+cGZu1nFzkDk="; + sha256 = "sha256-TJ3q97K3m3zYGB1D5lLVyrh61L3vtnP5I64lP/DYzW4="; }; patches = [ @@ -33,16 +34,15 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ - libuuid - openssl - ]; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isLinux libuuid + ++ lib.optional stdenv.isDarwin libossp_uuid; meta = with lib; { description = "Foundational support for signalwire C products"; homepage = "https://github.com/signalwire/libks"; maintainers = with lib.maintainers; [ misuzu ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 5ae0c2b7ed..76e471e0c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY="; + sha256 = "sha256-D8bTLwbWzl4UQHTS5X4NuN+k4451LTEjraJ8yviWNLw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index 254e5ca51e..95d615c5d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "15-4.1.0"; + version = "15-4.2.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - hash = "sha256-uZdszDE0UJVeegU1bi0ISYooC4ztNv7W4UQ2gWIjrH8="; + hash = "sha256-2fPdvsfuXKaRwkPjsPsBBfP0+yUgYXEUzQNFZfhyvGk="; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librevenge/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librevenge/default.nix index 627b7596c0..1dd71d1e31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librevenge/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librevenge/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "librevenge"; - version = "0.0.4"; + version = "0.0.5"; src = fetchurl { url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz"; - sha256 = "sha256-kz8HKfBCZ8w1S5oCvD6a/vpVEqO90LRfFZ7hSj4zR7I="; + sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix index 7daa4ad19e..a1daa89ef7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.8.3"; + version = "1.8.5"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w="; + sha256 = "sha256-FkkZIxSuqlFFOjABBpnE5ax2Vdo9tzP0prM7ATDIIdk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix index f6a796f256..ab36b271b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE="; + sha256 = "AuJjD/tc6TzVLDhCNSHf5wYzKIY6bpbUHXZaYRa4cH4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/maeparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/maeparser/default.nix index 73b25bb014..16459987c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/maeparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/maeparser/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "maeparser"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "schrodinger"; repo = "maeparser"; rev = "v${version}"; - sha256 = "sha256-9KxCR/spIZzePjmZe8qihIi1hEhPvxg/9dAlYmHxZPs="; + sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix new file mode 100644 index 0000000000..c98143dcc4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub +, lib +, stdenv +, cmake +}: +stdenv.mkDerivation rec{ + pname = "magic-enum"; + version = "0.8.2"; + src = fetchFromGitHub { + owner = "Neargye"; + repo = "magic_enum"; + rev = "v${version}"; + sha256 = "sha256-k4zCEQxO0N/o1hDYxw5p9u0BMwP/5oIoe/4yw7oqEo0="; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = with lib;{ + description = "Static reflection for enums (to string, from string, iteration) for modern C++"; + homepage = "https://github.com/Neargye/magic_enum"; + license = licenses.mit; + maintainers = with maintainers; [ Alper-Celik ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/stubs.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/stubs.nix index 753ad1b919..f3ea263cc9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/stubs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/stubs.nix @@ -1,8 +1,10 @@ { stdenv , libglvnd, mesa -, OpenGL }: +, OpenGL +, testers +}: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit (libglvnd) version; pname = "libGL"; outputs = [ "out" "dev" ]; @@ -72,4 +74,8 @@ stdenv.mkDerivation { genPkgConfig glesv1_cm GLESv1_CM genPkgConfig glesv2 GLESv2 ''; -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta.pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix index 0f358c2796..987f4022f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix @@ -14,11 +14,11 @@ assert builtins.elem network [ "ethernet" "infiniband" "omnipath" ]; stdenv.mkDerivation rec { pname = "mvapich"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-${version}.tar.gz"; - sha256 = "0jd28vy9ivl3rcpkxmhw73b6krzm0pd9jps8asw92wa00lm2z9mk"; + sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4="; }; nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix index 4caf05ef3c..4e2c731d7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -8,14 +8,15 @@ , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , mouseSupport ? false, gpm , unicodeSupport ? true +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "6.4"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/ncurses-${version}.tar.gz"; + url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz"; hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; @@ -169,11 +170,20 @@ stdenv.mkDerivation rec { ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp! ''; license = licenses.mit; + pkgConfigModules = let + base = [ + "form" + "menu" + "ncurses" + "panel" + ] ++ lib.optional withCxx "ncurses++"; + in base ++ lib.optionals unicodeSupport (map (p: p + "w") base); platforms = platforms.all; }; passthru = { ldflags = "-lncurses"; inherit unicodeSupport abiVersion; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index af83fb29c0..2810114cb6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, file , cunit, ncurses +, curlHTTP3 }: stdenv.mkDerivation rec { @@ -26,6 +27,10 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; + passthru.tests = { + inherit curlHTTP3; + }; + meta = with lib; { homepage = "https://github.com/ngtcp2/nghttp3"; description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index d6cacc0aa7..3ea84895eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -3,17 +3,18 @@ , libev, nghttp3, quictls , cunit, ncurses , withJemalloc ? false, jemalloc +, curlHTTP3 }: stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; + sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00="; }; outputs = [ "out" "dev" "doc" ]; @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; + passthru.tests = { + inherit curlHTTP3; + }; + meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index ac8dec4441..ef73f06e34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; + sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix index 7f0bd15aa5..d7b021e7c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.5.2"; + version = "1.6.0-prerelease"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "v${version}"; - sha256 = "sha256-qbjMLpPk5FxH710Mf8AIraY0mERbaxVVhTT94W0EV+k="; + rev = "539e559e65cd8f227c45e4b046ac41c0edcf6c32"; + sha256 = "sha256-86+f0um25Ywn78S2JrV54K7k3O6ots0q2dCco1aK0xM="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 5afc209922..2c676e008f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -48,7 +48,7 @@ , enableGtk3 ? false , gtk3 , enableVtk ? false -, vtk_8 +, vtk , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true @@ -253,7 +253,7 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk_8 + ++ lib.optional enableVtk vtk ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index 26a7676dd6..c016b7635a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.4.10"; + version = "2.4.12"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0="; + sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/cmake.patch b/third_party/nixpkgs/pkgs/development/libraries/openvino/cmake.patch new file mode 100644 index 0000000000..0918baba91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/openvino/cmake.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/developer_package/linux_name.cmake b/cmake/developer_package/linux_name.cmake +index 3e8c775770..2d5e00fb8b 100644 +--- a/cmake/developer_package/linux_name.cmake ++++ b/cmake/developer_package/linux_name.cmake +@@ -6,25 +6,7 @@ include(target_flags) + + if(LINUX) + function(get_linux_name res_var) +- if(EXISTS "/etc/lsb-release") +- # linux version detection using cat /etc/lsb-release +- file(READ "/etc/lsb-release" release_data) +- set(name_regex "DISTRIB_ID=([^ \n]*)\n") +- set(version_regex "DISTRIB_RELEASE=([0-9]+(\\.[0-9]+)?)") +- else() +- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \; +- OUTPUT_VARIABLE release_data +- RESULT_VARIABLE result) +- string(REPLACE "Red Hat" "CentOS" release_data "${release_data}") +- set(name_regex "NAME=\"([^ \"\n]*).*\"\n") +- set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") +- endif() +- +- string(REGEX MATCH ${name_regex} name ${release_data}) +- set(os_name ${CMAKE_MATCH_1}) +- +- string(REGEX MATCH ${version_regex} version ${release_data}) +- set(os_name "${os_name} ${CMAKE_MATCH_1}") ++ set(os_name "NixOS @version@") + + if(os_name) + set(${res_var} ${os_name} PARENT_SCOPE) diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix index e3ebb97cbd..2f8ecd5fc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -1,115 +1,167 @@ { lib -, addOpenGLRunpath -, autoPatchelfHook , stdenv , fetchFromGitHub , fetchpatch +, fetchurl +, substituteAll + +# build +, addOpenGLRunpath +, autoPatchelfHook , cmake , git -, protobuf -, tbb -, opencv -, unzip -, shellcheck -, srcOnly +, libarchive +, pkg-config , python -, enablePython ? false +, shellcheck + +# runtime +, libusb1 +, libxml2 +, opencv +, protobuf +, pugixml +, tbb }: let - - onnx_src = srcOnly { - name = "onnx-patched"; - src = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - rev = "v1.8.1"; - sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA="; - }; - patches = [ - # Fix build with protobuf 3.18+ - # Remove with onnx 1.9 release - (fetchpatch { - url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch"; - sha256 = "0vdsrklkzhdjaj8wdsl4icn93q3961g8dx35zvff0nhpr08wjb7y"; - }) - ]; + # See FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake + myriad_firmware_version = "20221129_35"; + myriad_usb_firmware = fetchurl { + url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_${myriad_firmware_version}.zip"; + hash = "sha256-HKNWbSlMjSafOgrS9WmenbsmeaJKRVssw0NhIwPYZ70="; + }; + myriad_pcie_firmware = fetchurl { + url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_${myriad_firmware_version}.zip"; + hash = "sha256-VmfrAoKQ++ySIgAxWQul+Hd0p7Y4sTF44Nz4RHpO6Mo="; }; + # See GNA_VERSION in cmake/dependencies.cmake + gna_version = "03.00.00.1910"; + gna = fetchurl { + url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; + hash = "sha256-iU3bwK40WfBFE7hTsMq8MokN1Oo3IooCK2oyEBvbt/g="; + }; + + tbbbind_version = "2_5"; + tbbbind = fetchurl { + url = "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v2.tgz"; + hash = "sha256-hl54lMWEAiM8rw0bKIBW4OarK/fJ0AydxgVhxIS8kPQ="; + }; in + stdenv.mkDerivation rec { pname = "openvino"; - version = "2021.2"; + version = "2022.3.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; - rev = version; - sha256 = "pv4WTfY1U5GbA9Yj07UOLQifvVH3oDfWptxxYW5IwVQ="; + rev = "refs/tags/${version}"; fetchSubmodules = true; + hash = "sha256-Ie58zTNatiYZZQJ8kJh/+HlSetQjhAtf2Us83z1jGv4="; }; + outputs = [ + "out" + "python" + ]; + + nativeBuildInputs = [ + addOpenGLRunpath + autoPatchelfHook + cmake + git + libarchive + pkg-config + (python.withPackages (ps: with ps; [ + cython + pybind11 + setuptools + ])) + shellcheck + ]; + + patches = [ + (substituteAll { + src = ./cmake.patch; + inherit (lib) version; + }) + ]; + + postPatch = '' + mkdir -p temp/vpu/firmware/{pcie,usb}-ma2x8x + pushd temp/vpu/firmware + bsdtar -xf ${myriad_pcie_firmware} -C pcie-ma2x8x + echo "${myriad_pcie_firmware.url}" > pcie-ma2x8x/ie_dependency.info + bsdtar -xf ${myriad_usb_firmware} -C usb-ma2x8x + echo "${myriad_usb_firmware.url}" > usb-ma2x8x/ie_dependency.info + popd + + mkdir -p temp/gna_${gna_version} + pushd temp/ + bsdtar -xf ${gna} + autoPatchelf gna_${gna_version} + echo "${gna.url}" > gna_${gna_version}/ie_dependency.info + popd + + mkdir -p temp/tbbbind_${tbbbind_version} + pushd temp/tbbbind_${tbbbind_version} + bsdtar -xf ${tbbbind} + echo "${tbbbind.url}" > ie_dependency.info + popd + ''; + dontUseCmakeBuildDir = true; cmakeFlags = [ - "-DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL=ON" - "-DFETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON" - "-DFETCHCONTENT_SOURCE_DIR_EXT_ONNX:STRING=${onnx_src}" - "-DENABLE_VPU:BOOL=OFF" - "-DTBB_DIR:STRING=${tbb}" + "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" + "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" + "-DENABLE_LTO:BOOL=ON" + # protobuf + "-DENABLE_SYSTEM_PROTOBUF:BOOL=OFF" + "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" + # tbb + "-DENABLE_SYSTEM_TBB:BOOL=ON" + # opencv "-DENABLE_OPENCV:BOOL=ON" - "-DOPENCV:STRING=${opencv}" - "-DENABLE_GNA:BOOL=OFF" - "-DENABLE_SPEECH_DEMO:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - "-DENABLE_CLDNN_TESTS:BOOL=OFF" - "-DNGRAPH_INTERPRETER_ENABLE:BOOL=ON" - "-DNGRAPH_TEST_UTIL_ENABLE:BOOL=OFF" - "-DNGRAPH_UNIT_TEST_ENABLE:BOOL=OFF" - "-DENABLE_SAMPLES:BOOL=OFF" - "-DENABLE_CPPLINT:BOOL=OFF" - ] ++ lib.optionals enablePython [ + "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/" + # pugixml + "-DENABLE_SYSTEM_PUGIXML:BOOL=ON" + # onednn + "-DENABLE_ONEDNN_FOR_GPU:BOOL=OFF" + # intel gna + "-DENABLE_INTEL_GNA:BOOL=ON" + # python "-DENABLE_PYTHON:BOOL=ON" + # tests + "-DENABLE_CPPLINT:BOOL=OFF" + "-DBUILD_TESTING:BOOL=OFF" + "-DENABLE_SAMPLES:BOOL=OFF" ]; - preConfigure = '' - # To make install openvino inside /lib instead of /python - substituteInPlace inference-engine/ie_bridges/python/CMakeLists.txt \ - --replace 'DESTINATION python/''${PYTHON_VERSION}/openvino' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino' \ - --replace 'DESTINATION python/''${PYTHON_VERSION}' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino' - substituteInPlace inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt \ - --replace 'python/''${PYTHON_VERSION}/openvino/inference_engine' 'lib/''${PYTHON_VERSION}/site-packages/openvino/inference_engine' - - # Used to download OpenCV based on Linux Distro and make it use system OpenCV - substituteInPlace inference-engine/cmake/dependencies.cmake \ - --replace 'include(linux_name)' ' ' \ - --replace 'if (ENABLE_OPENCV)' 'if (ENABLE_OPENCV AND NOT DEFINED OPENCV)' - - cmakeDir=$PWD - mkdir ../build - cd ../build - ''; - - autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; - - nativeBuildInputs = [ - cmake - autoPatchelfHook - addOpenGLRunpath - unzip + autoPatchelfIgnoreMissingDeps = [ + "libngraph_backend.so" ]; buildInputs = [ - git - protobuf + libusb1 + libxml2 opencv - python + protobuf + pugixml tbb - shellcheck - ] ++ lib.optionals enablePython (with python.pkgs; [ - cython - pybind11 - ]); + ]; + + enableParallelBuilding = true; + + postInstall = '' + pushd $out/python/python${lib.versions.majorMinor python.version} + mkdir -p $python + mv ./* $python/ + popd + rm -r $out/python + ''; postFixup = '' # Link to OpenCL @@ -130,8 +182,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = (stdenv.isLinux && stdenv.isx86_64) # at 2022-09-23 - || stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix index df42dea81a..9c526b6fdc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "pinocchio"; - version = "2.6.15"; + version = "2.6.16"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-bnm5nbb0mKw76k2J2Qi04n7bmfzadtqV/AmnWSzbb+0="; + hash = "sha256-ihyLoElqpIhsZXPF3o4XgbkzeE/BYdz8+WhLLcpc6PE="; }; # error: use of undeclared identifier '__sincos' diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index ccae3037e0..d99e515067 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg="; + hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index 130f681d84..cbe669ffd3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -53,8 +53,6 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { mainProgram = "protoc"; platforms = lib.platforms.unix; }; - - passthru.version = version; }; in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) then (mkProtobufDerivation null buildPackages.stdenv) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index 6da193bbd5..e71b0a7613 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -222,8 +222,8 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ - # build as a set of dynamic libraries - "-DFEATURE_framework=OFF" + # error: 'path' is unavailable: introduced in macOS 10.15 + "-DQT_FEATURE_cxx17_filesystem=OFF" ]; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix index f43a917665..4221d24679 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "quarto"; - version = "1.2.313"; + version = "1.2.335"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-l8i/s9OuG9Fz+i1PcdSqP9X8stY6LTUcIfdE2gaePac="; + sha256 = "sha256-f9b6vDiE/CDsPE8/AseWVTXPZH14wOQtUskMv42Xhcg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix index 4867c67277..aede57810a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i"; + sha256 = "sha256-6iI+s+iSKK8TeocvyOxou7cF9ZXlWr5prUbPhoHOoSM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix index 39d714ce84..6e5795cd30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix @@ -19,7 +19,8 @@ }: let - rocfft = stdenv.mkDerivation (finalAttrs: { + # This is over 3GB, to allow hydra caching we separate it + rf = stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; version = "5.4.2"; @@ -112,27 +113,23 @@ let }; }); - rocfft-zero = runCommand "rocfft-zero" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-0* $out + rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-one = runCommand "rocfft-one" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-1* $out + rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-two = runCommand "rocfft-two" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-2* $out + rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-three = runCommand "rocfft-three" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-3* $out + rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; in stdenv.mkDerivation { - inherit (rocfft) pname version outputs src passthru meta; + inherit (rf) pname version outputs src passthru meta; dontUnpack = true; dontPatch = true; @@ -143,16 +140,15 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/lib - - for path in ${rocfft-zero} ${rocfft-one} ${rocfft-two} ${rocfft-three}; do - cp -as $path/* $out/lib - done - - cp -an ${rocfft}/* $out + cp -as ${rf-zero} $out/lib/${rf-zero.name} + cp -as ${rf-one} $out/lib/${rf-one.name} + cp -as ${rf-two} $out/lib/${rf-two.name} + cp -as ${rf-three} $out/lib/${rf-three.name} + cp -an ${rf}/* $out '' + lib.optionalString buildTests '' - cp -a ${rocfft.test} $test + cp -a ${rf.test} $test '' + lib.optionalString buildBenchmarks '' - cp -a ${rocfft.benchmark} $benchmark + cp -a ${rf.benchmark} $benchmark '' + '' runHook postInstall ''; @@ -160,18 +156,18 @@ in stdenv.mkDerivation { # Fix paths preFixup = '' substituteInPlace $out/include/*.h $out/rocfft/include/*.h \ - --replace "${rocfft}" "$out" + --replace "${rf}" "$out" patchelf --set-rpath \ - $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rf}/lib,'"$out/lib"',') \ $out/lib/librocfft.so '' + lib.optionalString buildTests '' patchelf --set-rpath \ - $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rf}/lib,'"$out/lib"',') \ $test/bin/rocfft-test '' + lib.optionalString buildBenchmarks '' patchelf --set-rpath \ - $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rf}/lib,'"$out/lib"',') \ $benchmark/bin/rocfft-rider ''; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix new file mode 100644 index 0000000000..54c0d03979 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gfortran +, blas +, lapack +}: + +assert !blas.isILP64; +assert !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "harminv"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + }; + + # File is missing in the git checkout but required by autotools + postPatch = '' + touch ChangeLog + ''; + + nativeBuildInputs = [ autoreconfHook gfortran ]; + + buildInputs = [ blas lapack ]; + + configureFlags = [ "--enable-shared" ]; + + meta = with lib; { + description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; + homepage = "https://github.com/NanoComp/harminv"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix new file mode 100644 index 0000000000..c3257bad3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "libGDSII"; + version = "0.21"; + + src = fetchFromGitHub { + owner = "HomerReid"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + }; + + # File is missing in the repo but automake requires it + postPatch = '' + touch ChangeLog + ''; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Library and command-line utility for reading GDSII geometry files"; + homepage = "https://github.com/HomerReid/libGDSII"; + license = [ licenses.gpl2Only ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index cd105a1133..85072f77da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "7.7.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-2PYUGTMVQ5qVDeeABrwR45U3JIgo2xMXKlD6da7y3Dw="; + hash = "sha256-89ngeZHdjyL/OoGuQ+F5eaXE1/od0EEfIgw9eKdLtL8="; }; # "This test is stochastic and may occassionally fail". It does. diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index 0fcf4a6c04..6ac453aec2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -4,19 +4,19 @@ , cmake , csxcad , tinyxml -, vtk_8_withQt5 +, vtkWithQt5 , qtbase }: mkDerivation { pname = "qcsxcad"; - version = "unstable-2020-01-04"; + version = "unstable-2023-01-06"; src = fetchFromGitHub { owner = "thliebig"; repo = "QCSXCAD"; - rev = "0dabbaf2bc1190adec300871cf309791af842c8e"; - sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; + rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6"; + hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY="; }; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ mkDerivation { buildInputs = [ csxcad tinyxml - vtk_8_withQt5 + vtkWithQt5 qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sealcurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sealcurses/default.nix index bde530dd9d..ad1eb0bb27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sealcurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sealcurses/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sealcurses"; - version = "unstable-2022-05-18"; # No release yet + version = "unstable-2023-02-06"; # No release yet src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = pname; - rev = "417d77d790ede990b4c149f21c58fd13b8f273cc"; - hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo="; + rev = "e11026ca34b03c5ab546512f82a6f705d0c29e95"; + hash = "sha256-N+Tvg2oIcfa68FC7rKuLxGgEKz1oBEEb8NGCiBuZ8y4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index 19dfb62002..f0f9596f95 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-dmYeXGXbe05WiT2ZDrH4aCmymDjj8SqrZyEc3d0Uf0Y="; + sha256 = "sha256-IGQQBSyh8hjZuymmRtU4FI2n7FyYmP28Nun9eorvAHY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix b/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix index 95ea916e09..2970fb3c84 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-wPFBKc20/ED58RFpDhmPnlSHCf3FG5sD2ubQOl5NF+o="; + hash = "sha256-+V2WJYEmIZWpioNvvZMiw7Vt9ogEnEcjq+vR7UiBTO0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix index c576405bb3..93500e17b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix @@ -2,17 +2,25 @@ stdenv.mkDerivation rec { pname = "tinyxml-2"; - version = "6.0.0"; + version = "9.0.0"; src = fetchFromGitHub { repo = "tinyxml2"; owner = "leethomason"; rev = version; - sha256 = "031fmhpah449h3rkyamzzdpzccrrfrvjb4qn6vx2vjm47jwc54qv"; + sha256 = "sha256-AQQOctXi7sWIH/VOeSUClX6hlm1raEQUOp+VoPjLM14="; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + meta = { description = "A simple, small, efficient, C++ XML parser"; homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 32225a7bb0..59aa84b951 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EB42CPHCi/7YriVSL3pyC1WfiJp24oCvvlCk2LBk+Sw="; + sha256 = "jk85dkcmQbZI0PjyDeuuGxYpyltWC4YW4RfSnXVvvus="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index 3a82bafa3e..715755bb94 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -48,6 +48,13 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) + + # Fix copying text with GTK 4. + # https://gitlab.gnome.org/GNOME/vte/-/issues/2584 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/-/commit/ddb2c8ae0baf3b73d77d1f6ce6142e92faa632af.patch"; + hash = "sha256-5Eu0EH0MBJqJUZ6d5bVe5+hl4Z/Gd3Yltz0VAQK7ogY="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix index 8d229678a3..bb764d6414 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -8,7 +8,7 @@ , wayland-scanner , expat , libxml2 -, withLibraries ? true +, withLibraries ? stdenv.isLinux , libffi , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform , graphviz-nox diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 4e22df60f5..99ee89edca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.3"; + version = "2.38.4"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo="; + hash = "sha256-T0fqKaLU1fFe7z3J4tbG8Gfo3oY6P2RFXhzPlpPMHTY="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix new file mode 100644 index 0000000000..3231fa2744 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doctest +, nlohmann_json +, libuuid +, xtl +}: + +stdenv.mkDerivation rec { + pname = "xeus"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = pname; + rev = version; + sha256 = "sha256-LeU4PJ1UKfGqkRKq0/Mn9gjwNmXCy0/2SbjWJrjlOyU="; + }; + + nativeBuildInputs = [ + cmake + doctest + ]; + + buildInputs = [ + nlohmann_json + libuuid + xtl + ]; + + cmakeFlags = [ + "-DXEUS_BUILD_TESTS=ON" + ]; + + doCheck = true; + preCheck = ''export LD_LIBRARY_PATH=$PWD''; + + meta = with lib; { + homepage = "https://xeus.readthedocs.io"; + description = "C++ implementation of the Jupyter Kernel protocol"; + license = licenses.bsd3; + maintainers = with maintainers; [ serge_sans_paille ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/zint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zint/default.nix index fc6fd501c4..15aecee196 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zint/default.nix @@ -12,17 +12,15 @@ stdenv.mkDerivation rec { pname = "zint"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "zint"; repo = "zint"; rev = version; - sha256 = "sha256-ozhXy7ftmGz1XvmF8AS1ifWJ3Q5hLSsysB8qLUP60n8="; + hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk="; }; - patches = [ ./qobject.patch ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zint/qobject.patch b/third_party/nixpkgs/pkgs/development/libraries/zint/qobject.patch deleted file mode 100644 index f991d52648..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/zint/qobject.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/backend_qt/qzint.h b/backend_qt/qzint.h -index d57ab6a..62fb0a4 100644 ---- a/backend_qt/qzint.h -+++ b/backend_qt/qzint.h -@@ -19,6 +19,7 @@ - #ifndef QZINT_H - #define QZINT_H - -+#include - #include - #include - #include "zint.h" diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix index 52654b6541..4ca77d56fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -8,6 +8,7 @@ # the `.pc` file lists only the main output's lib dir. # If false, and if `{ static = true; }`, the .a stays in the main output. , splitStaticOutput ? shared && static +, testers }: # Without either the build will actually still succeed because the build @@ -21,11 +22,13 @@ assert shared || static; assert splitStaticOutput -> static; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zlib"; version = "1.2.13"; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { urls = [ # This URL works for 1.2.13 only; hopefully also for future releases. "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.gz" @@ -125,10 +128,13 @@ stdenv.mkDerivation rec { "SHARED_MODE=1" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://zlib.net"; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; + pkgConfigModules = [ "zlib" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix index 70270a58dd..3c4dc5194e 100644 --- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.199"; + version = "0.6.204"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6sEgxUDKKAFWxWQqTb8hLt+vqlkD/9f5zdj9rh3sDLM="; + sha256 = "sha256-MQF0mU1cpvkJ6VZE6A8J4W6DMS8RXhjLisrPkKParl4="; }; - vendorHash = "sha256-hpS8fyyWIw1vkWXyd1OxyorGT5j4bJ5Ey+Hh48QF0p0="; + vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 5869a0e172..c4213f0b8c 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -39,6 +39,7 @@ , "awesome-lint" , "balanceofsatoshis" , "bash-language-server" +, "bibtex-tidy" , "bower" , "bower2nix" , "browserify" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 6b11be178f..c243f30740 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -148,13 +148,13 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1501.3" = { + "@angular-devkit/architect-0.1501.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1501.3"; + version = "0.1501.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.3.tgz"; - sha512 = "+hvesYUgChdAkBcWSO2pseIGBzRDAATyIw36UBwOmYkL7wM65TEXpspbo5ZIfU1M/l7X/lHzDXLTzCMfb0Qxbg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.4.tgz"; + sha512 = "PE0CqPaNzcz8yHEuJwqtKxYvXX9hgWWvC6hI2DWKtC+5WgJLAYJNEGofXQRc227Nj+YySEYUUo8Ja8SYl3lDxA=="; }; }; "@angular-devkit/core-15.0.4" = { @@ -166,13 +166,13 @@ let sha512 = "4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA=="; }; }; - "@angular-devkit/core-15.1.3" = { + "@angular-devkit/core-15.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "15.1.3"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.3.tgz"; - sha512 = "biuS+DceyZEqcE/cLvndtslqn3Q6uCmJ0RLpACikH6ESYorvk+A91H0ofuGue6HB/2CUN/F+mPSr7sWVI1W9sA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz"; + sha512 = "PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg=="; }; }; "@angular-devkit/schematics-15.0.4" = { @@ -184,22 +184,22 @@ let sha512 = "/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig=="; }; }; - "@angular-devkit/schematics-15.1.3" = { + "@angular-devkit/schematics-15.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "15.1.3"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.3.tgz"; - sha512 = "IXZ56/5uFnHqnLq+80JhmFx5mflyW8LgS/8Tr2l5DYVA71Fh3b1q+vGrEZB1X2zPoFeDOGAxv3Fi+kmjcz1GZg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.4.tgz"; + sha512 = "jpddxo9Qd2yRQ1t9FLhAx5S+luz6HkyhDytq0LFKbxf9ikf1J4oy9riPBFl4pRmrNARWcHZ6GbD20/Ky8PjmXQ=="; }; }; - "@angular-devkit/schematics-cli-15.0.4" = { + "@angular-devkit/schematics-cli-15.1.4" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "15.0.4"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.0.4.tgz"; - sha512 = "rEzkpjiQcJqCgbZ1Ns8jn1BL4724jcj+YFS7Qw5d4v6yQYA8iSLz12HDTH0TiNEv7u5S55fYuRz2QreI0QUT8A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.1.4.tgz"; + sha512 = "qkM5Mfs28jZzNcJnSM6RlyrKkYvzhQmWFTxBXnn15k5T4EnSs1gI6O054Xn7jo/senfwNNt7h2Mlz2OmBLo6+w=="; }; }; "@antora/asciidoc-loader-3.1.2" = { @@ -553,13 +553,13 @@ let sha512 = "6bBFeDTtPOn4jZaiD3p0f05MEGQL9pw2Zbfj546oFETNmjJFWO3nzHz6/m+P53calknCvyVzZ5YhoBLIvzn5iw=="; }; }; - "@asyncapi/specs-3.2.1" = { + "@asyncapi/specs-4.1.0" = { name = "_at_asyncapi_slash_specs"; packageName = "@asyncapi/specs"; - version = "3.2.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.1.tgz"; - sha512 = "FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="; + url = "https://registry.npmjs.org/@asyncapi/specs/-/specs-4.1.0.tgz"; + sha512 = "2arh2J4vGUkgx7Y8zB2UMdYpgYiL4P+Te1Na5Yi9IEDe6UBVwOGFYK8MR7HZ0/oInHQFygpuouAjHnIifoZykg=="; }; }; "@aws-crypto/crc32-3.0.0" = { @@ -661,40 +661,40 @@ let sha512 = "JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA=="; }; }; - "@aws-sdk/client-s3-3.259.0" = { + "@aws-sdk/client-s3-3.264.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.259.0.tgz"; - sha512 = "yZy7oTTqPAn5H1SxbsynzVRr6kSf5hJQYl00P1dpzsAjTJmRzV4CdHwUxsBkyfUeC6u324iJi9zir1v8HHgUJw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.264.0.tgz"; + sha512 = "YhpbK+vlqvhIpoBLl/e/qL2f7KOE8WZ2Wq/Nyj7/aGhSz9MRqXCOQ7HPeox6szym705JYC29jwHqvIEr3ybE2Q=="; }; }; - "@aws-sdk/client-sso-3.259.0" = { + "@aws-sdk/client-sso-3.264.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.259.0.tgz"; - sha512 = "TKi9Lj0zqxsrQWOZ+e4WchNDtLDz6B+ahMzYDIOFlglDPPEzbZE//PBMZCba/AAIe6U3xaUQSnni+4mNbRLg7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.264.0.tgz"; + sha512 = "p+7sYpRcdv9omnnsPhD/vOFuZ1SpfV62ZgistBK/RDsQg2W9SIWQRW1KPt7gOCQ0nwp4efntw4Sle0LjS7ykxg=="; }; }; - "@aws-sdk/client-sso-oidc-3.259.0" = { + "@aws-sdk/client-sso-oidc-3.264.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.259.0.tgz"; - sha512 = "TKpUX55qLM35sQXx96VnB/ZcQCcBxVU/0j0wqL8Hij+blD7fy6KrGGJPORzRphmFg8Ehf1IoCivFxrQwLrjZ6A=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.264.0.tgz"; + sha512 = "82hGEbfsD4lBGIF1q8o82jTNSgBCcBpfFsvA+ltZf0bh4ChIWOi4vVvg8G+zVQN1mm/Rj8vWYO/D0tNF8OSyWw=="; }; }; - "@aws-sdk/client-sts-3.259.0" = { + "@aws-sdk/client-sts-3.264.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.259.0.tgz"; - sha512 = "LXqua4FoXxR30sM4BSwmPI6x0YmDTw6yQhxQQXA5hrx+YwUf8CSpa0K6Xwfv8M5+zP0uHfY1iVxx/rnT8FOEmA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.264.0.tgz"; + sha512 = "sco1jREkDdds4Z3V19Vlu/YpBHSzeEt1KFqOPnbjFw7pSakRNzpyWmLLxOwWjwgGKt6pSF3Aw0ZOMYsAUDc5qQ=="; }; }; "@aws-sdk/config-resolver-3.259.0" = { @@ -724,22 +724,22 @@ let sha512 = "yCxoYWZAaDrCUEWxRfrpB0Mp1cFgJEMYW8T6GIb/+DQ5QLpZmorgaVD/j90QXupqFrR5tlxwuskBIkdD2E9YNg=="; }; }; - "@aws-sdk/credential-provider-ini-3.259.0" = { + "@aws-sdk/credential-provider-ini-3.264.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.259.0.tgz"; - sha512 = "/sjZv+XvcSMnvDTsau0cHxMFcbz4f4ksvgu10JQ1PpcH5CPQJviDJjZRzzijcOuMZ3SOO0skyuYU6tjY18cgIg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.264.0.tgz"; + sha512 = "UU5NNlfn+Go+5PLBzyTH1YE3r/pgykpE4QYFon87sCnEQnQH9xmlRTW1f1cBSQ9kivbFZd2/C2X3qhB3fe2JfA=="; }; }; - "@aws-sdk/credential-provider-node-3.259.0" = { + "@aws-sdk/credential-provider-node-3.264.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.259.0.tgz"; - sha512 = "7doM6hCPTZD0H+A7VtElLY4Ztuhg3MbjoHs00TyPZNCym7f/AKmKi9Exiw1tGgxTJkfn/SzcAWz+TyqMP078ow=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.264.0.tgz"; + sha512 = "DPzL7oawcILs5Mduim9Z8SVeJaUpaDRVbUIrBHsMBu+N7Zuqtzr+0ckHc1bEi3iYq2QUCk5pH5vpQaZYkMlbtw=="; }; }; "@aws-sdk/credential-provider-process-3.257.0" = { @@ -751,13 +751,13 @@ let sha512 = "xK8uYeNXaclaBCGrLi4z2pxPRngqLf5BM5jg2fn57zqvlL9V5gJF972FehrVBL0bfp1/laG0ZJtD2K2sapyWAw=="; }; }; - "@aws-sdk/credential-provider-sso-3.259.0" = { + "@aws-sdk/credential-provider-sso-3.264.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.259.0.tgz"; - sha512 = "cz+8aNKxvZ8ikd0JDcB9MZredOJNRZkbco8QAM0gXfy6ziyX+23oU8+aekZljDzQR5QNRouvMz1KKmBxZLpNyg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.264.0.tgz"; + sha512 = "CJuAlqIIJap6LXoqimvEAnYZ7Kb5pTbiS3e+aY+fajO3OPujmQpHuiY8kOmscjwZ4ErJdEskivcTGwXph0dPZQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.257.0" = { @@ -895,13 +895,13 @@ let sha512 = "yiawbV2azm6QnMY1L2ypG8PDRdjOcEIvFmT0T7y0F49rfbKJOu21j1ONAoCkLrINK6kMqcD5JSQLVCoURxiTxQ=="; }; }; - "@aws-sdk/middleware-endpoint-3.257.0" = { + "@aws-sdk/middleware-endpoint-3.264.0" = { name = "_at_aws-sdk_slash_middleware-endpoint"; packageName = "@aws-sdk/middleware-endpoint"; - version = "3.257.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.257.0.tgz"; - sha512 = "RQNQe/jeVuWZtXXfcOm+e3qMFICY6ERsXUrbt0rjHgvajZCklcrRJgxJSCwrcS7Le3nl9azFPMAMj9L7uSK28g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.264.0.tgz"; + sha512 = "H9JEAug3Oo3IA2wZIplVVF6NtauCIjICXWgbNbA8Im+I2KPe0jWtOdtQv4U+tqHe9T4zIixaCM3gjUBld+FoOA=="; }; }; "@aws-sdk/middleware-expect-continue-3.257.0" = { @@ -1084,13 +1084,13 @@ let sha512 = "UDrE1dEwWrWT8dG2VCrGYrPxCWOkZ1fPTPkjpkR4KZEdQDZBqU5gYZF2xPj8Nz7pjQVHFuW2wFm3XYEk56GEjg=="; }; }; - "@aws-sdk/s3-request-presigner-3.259.0" = { + "@aws-sdk/s3-request-presigner-3.264.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.259.0.tgz"; - sha512 = "1qoVZk/HEnnfsbcsbBa5Y/P34T2wI209+VyEtPQzzmZbBJvOONKWySk2sAS+AJO2ZjZZur/sUS61wteuklDZEA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.264.0.tgz"; + sha512 = "8DNVV4tO6xkmoUA6n8iCgRC9adL8e3aphSXNykA2jWricTaR1/NtD9+5uYeklQbEh4EVisaQJJldOMlbB2GtXQ=="; }; }; "@aws-sdk/service-error-classification-3.257.0" = { @@ -1120,40 +1120,40 @@ let sha512 = "aLQQN59X/D0+ShzPD3Anj5ntdMA/RFeNLOUCDyDvremViGi6yxUS98usQ/8bG5Rq0sW2GGMdbFUFmrDvqdiqEQ=="; }; }; - "@aws-sdk/signature-v4-crt-3.257.0" = { + "@aws-sdk/signature-v4-crt-3.264.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.257.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.257.0.tgz"; - sha512 = "FHM/QulXKxCpAVmAgGduHLps6HAQHZvhY7nnWY+G2Q1S6+d8ijZeaG0fAl7bpZW6FrBbijkWEZV+F7p+V/AHqQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.264.0.tgz"; + sha512 = "r58rcGm/3CHhZRE0BtcpDgfRCkDsY9az8SwEcfInth8RPY2HJWsDohd7D03QClt0dlmDuPrCRcN4lZ+HOYYHSQ=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.257.0" = { + "@aws-sdk/signature-v4-multi-region-3.264.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.257.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.257.0.tgz"; - sha512 = "4ZyJp6my6F6R8jG+zlIR+Sw3W2vZcBTcpzAnSAHI0UBWjx5/buiKU5QY7oj29H3pESDD7DovZinD7TtHvMNoZw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.264.0.tgz"; + sha512 = "45rNJeC245g2HtDlxlcgNhB9YU0PcWXGNOLOiMWq3cSMNsaKJoTD1tLdBke2VjW7Hz7QBCWLCRAftHatnWcdyg=="; }; }; - "@aws-sdk/smithy-client-3.257.0" = { + "@aws-sdk/smithy-client-3.261.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.257.0"; + version = "3.261.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.257.0.tgz"; - sha512 = "Vy/en+llpslHG6WZ2yuN+On6u7p2hROEURwAST/lpReAwBETjbsxylkWvP8maeGKQ54u9uC6lIZAOJut2I3INw=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.261.0.tgz"; + sha512 = "j8XQEa3caZUVFVZfhJjaskw80O/tB+IXu84HMN44N7UkXaCFHirUsNjTDztJhnVXf/gKXzIqUqprfRnOvwLtIg=="; }; }; - "@aws-sdk/token-providers-3.259.0" = { + "@aws-sdk/token-providers-3.264.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.259.0"; + version = "3.264.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.259.0.tgz"; - sha512 = "61lbk+vjlHBtNK7ZOTdR0rgk9dQ6++tklHpXZY3AQWAl3xx6K4y00HsyAtcP6k24s8B356QwXlrQJrQY5nnkQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.264.0.tgz"; + sha512 = "1N54FCdBJRqrwFWHUoDpGI0rKhI29Or9ZwGjjcBzKzLhz5sEF/DEhuID7h1/KKEkXdQ0+lmXOFGMMrahrMpOow=="; }; }; "@aws-sdk/types-3.257.0" = { @@ -1228,31 +1228,31 @@ let sha512 = "DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg=="; }; }; - "@aws-sdk/util-create-request-3.257.0" = { + "@aws-sdk/util-create-request-3.261.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.257.0"; + version = "3.261.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.257.0.tgz"; - sha512 = "2s1/LuNtauhwULdYTDMlLCKKmaYZTO8AcAVGOU5n8rCe9eQYWV77xITcf0iB7ilKq/nXBstIpYsbuldq4AIqXQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.261.0.tgz"; + sha512 = "ZpTO76BBDdwE88pwYkAU816u34oOMXbJXoqVTw+EjLKOroCQYgJAu5VcGZ/vYFZ9zdLABQhqQZ1Cxag/w8sxLw=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.257.0" = { + "@aws-sdk/util-defaults-mode-browser-3.261.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.257.0"; + version = "3.261.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.257.0.tgz"; - sha512 = "nkfK+MNacVd3Px/fcAvU0hDeh+r7d+RLLt3sJ5Zc0gGd+i3OQEP58V8QzR9PYMvUvSvGQP16fQVQHSbRZtuWyQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.261.0.tgz"; + sha512 = "lX3X1NfzQVV6cakepGV24uRcqevlDnQ8VgaCV8dhnw1FVThueFigyoFaUA02+uRXbV9KIbNWkEvweNtm2wvyDw=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.259.0" = { + "@aws-sdk/util-defaults-mode-node-3.261.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.259.0"; + version = "3.261.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.259.0.tgz"; - sha512 = "wRiiwT7ayIcTYGHUg/Ho9UN/Kd4V37OAxP2IbkG9rPZJNuvtKopQJhUSMDERXaMQ47dG5US8G4YVYJIEO4cKgw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.261.0.tgz"; + sha512 = "4AK6yu4bOmHSocUdbGoEHbNXB09UA58ON2HBHY4NxMBuFBAd9XB2tYiyhce+Cm+o+lHbS8oQnw0VZw16WMzzew=="; }; }; "@aws-sdk/util-endpoints-3.257.0" = { @@ -1426,13 +1426,13 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.0" = { + "@azure/core-client-1.7.1" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; - sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; + sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; }; }; "@azure/core-http-2.3.1" = { @@ -1453,22 +1453,22 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.5.0" = { + "@azure/core-lro-2.5.1" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; - sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; + sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; }; }; - "@azure/core-paging-1.4.0" = { + "@azure/core-paging-1.5.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; - sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; + sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; "@azure/core-rest-pipeline-1.10.1" = { @@ -1921,13 +1921,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.20.13" = { + "@babel/parser-7.20.15" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.13"; + version = "7.20.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; - sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; + sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -2335,13 +2335,13 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.14" = { + "@babel/plugin-transform-block-scoping-7.20.15" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.14"; + version = "7.20.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.14.tgz"; - sha512 = "sMPepQtsOs5fM1bwNvuJJHvaCfOEQfmc01FGw0ELlTpTJj5Ql/zuNRRldYhAPys4ghXdBIQJbRVYi44/7QflQQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz"; + sha512 = "Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA=="; }; }; "@babel/plugin-transform-classes-7.20.7" = { @@ -3136,40 +3136,40 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.19.2" = { + "@cspell/cspell-bundled-dicts-6.22.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.19.2.tgz"; - sha512 = "dbzMGK1JHRTUJ8Pkw/EYbj02RMYhM1/vfrAzgRpqogj83m0cfBC/0IHELkVIl3taC1KdFZ1XHXPp7310LZ6+ww=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.22.0.tgz"; + sha512 = "73oCpJzagl7mNMAMlKNLdk4DQDEKhv0IsU5Pz/BvYNWxI2KczYiyPLSk/y/bO0mNQTxFgHvKUie+GoATGB9LyA=="; }; }; - "@cspell/cspell-pipe-6.19.2" = { + "@cspell/cspell-pipe-6.22.0" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.19.2.tgz"; - sha512 = "OS+hUdSXU8408OjzBl1EgQ0R4OCXSFAthkN2nqByuQvIa2Ho0yRtXB9BgGCwfcAaffNzdLyTzzQsHhLjjRO0gg=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.22.0.tgz"; + sha512 = "azitnOyh2lIN2brJBQE7NSURUOC7P911BuGf5cPb6cEFLSBSkPfuet5yTjgVSd8oq2kgv/irEz4BbEMjAYL4ag=="; }; }; - "@cspell/cspell-service-bus-6.19.2" = { + "@cspell/cspell-service-bus-6.22.0" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.19.2.tgz"; - sha512 = "PVv8q1y2KtuYIXd7tbWujJHNrIgd93k5aOEB9ffIMrrw1MhDFnuuB1l4rDN83zykLlab2dWPU29zhaGnH/EtMw=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.22.0.tgz"; + sha512 = "zskChnBYBuInkgp2wUF5xvOA20YF3DMovPHUaRByahB2DQwAZXGLnYxCBM70+xkIsOURGcjpvpyzry7bPMBXiw=="; }; }; - "@cspell/cspell-types-6.19.2" = { + "@cspell/cspell-types-6.22.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.19.2.tgz"; - sha512 = "Eyivx0MAuYdOAOXrNC/oksMx5QL9NBi9Vvb+7CWPJSFk7p66B5sjcxAz6ujZcQ1WVBLoAqL75BoIqF+lgma9aA=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.22.0.tgz"; + sha512 = "AcvI7QkjpGL+CHz3WJTXn/A8OigwhjQ5eBZ09t+f42am5sjygcBR8n77wWjpKcY853XkOpqP4qIvXcZJzSUzUw=="; }; }; "@cspell/dict-ada-4.0.1" = { @@ -3397,13 +3397,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.2.0" = { + "@cspell/dict-en_us-4.2.1" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.2.0.tgz"; - sha512 = "n5hz8vQ6FAp4f+ZW/raN/f4G69V1LrhNZ7kgXM+Nirmkrz16oXmd1defTulbd7yf2T2XU8DmsrTnkuRG9mSQKw=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.2.1.tgz"; + sha512 = "zjHvRAJeNJgLaIn4DgO2rkCaKC2SyMJ7HKQTPJKDoINTVXJxcCt/5K0xjDyBJAezQYJfkX8Na0r+Ii2PpaLqtA=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3865,13 +3865,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/strong-weak-map-6.19.2" = { + "@cspell/dynamic-import-6.22.0" = { + name = "_at_cspell_slash_dynamic-import"; + packageName = "@cspell/dynamic-import"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.22.0.tgz"; + sha512 = "Dkravk0nQklyr13pClBXjg/Ku4o2jc6vdVp71L3bfXCQh8StdWP/kyW6O6qjXUsWwGAuRl8YuamRLePlVV8q3A=="; + }; + }; + "@cspell/strong-weak-map-6.22.0" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.19.2.tgz"; - sha512 = "0P2f1JNGw+lEyqz0jxj1ob+772HgbQEIrXXuWF9vQXKdYx0kVzkSNVAUGZjqWiO+ieGFJVr0pqHA+wGcIx1VAQ=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.22.0.tgz"; + sha512 = "Krfq5P+s9R1qH3hvhMC40SsU49v6/qGvvPP1kGwToAHEDDGVyRA9xgz/RswDThgEzpzwMuOGzjZlQ3P3luHnug=="; }; }; "@cspotcode/source-map-consumer-0.8.0" = { @@ -4306,96 +4315,6 @@ let sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; }; }; - "@esbuild/android-arm-0.16.17" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz"; - sha512 = "N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw=="; - }; - }; - "@esbuild/android-arm64-0.16.17" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz"; - sha512 = "MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg=="; - }; - }; - "@esbuild/android-x64-0.16.17" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz"; - sha512 = "a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ=="; - }; - }; - "@esbuild/darwin-arm64-0.16.17" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz"; - sha512 = "/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w=="; - }; - }; - "@esbuild/darwin-x64-0.16.17" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz"; - sha512 = "2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg=="; - }; - }; - "@esbuild/freebsd-arm64-0.16.17" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz"; - sha512 = "mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw=="; - }; - }; - "@esbuild/freebsd-x64-0.16.17" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz"; - sha512 = "8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug=="; - }; - }; - "@esbuild/linux-arm-0.16.17" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz"; - sha512 = "iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ=="; - }; - }; - "@esbuild/linux-arm64-0.16.17" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz"; - sha512 = "7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g=="; - }; - }; - "@esbuild/linux-ia32-0.16.17" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz"; - sha512 = "kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg=="; - }; - }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4405,114 +4324,6 @@ let sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; }; }; - "@esbuild/linux-loong64-0.16.17" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz"; - sha512 = "dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ=="; - }; - }; - "@esbuild/linux-mips64el-0.16.17" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz"; - sha512 = "ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw=="; - }; - }; - "@esbuild/linux-ppc64-0.16.17" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz"; - sha512 = "dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g=="; - }; - }; - "@esbuild/linux-riscv64-0.16.17" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz"; - sha512 = "ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw=="; - }; - }; - "@esbuild/linux-s390x-0.16.17" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz"; - sha512 = "gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w=="; - }; - }; - "@esbuild/linux-x64-0.16.17" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz"; - sha512 = "mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw=="; - }; - }; - "@esbuild/netbsd-x64-0.16.17" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz"; - sha512 = "/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA=="; - }; - }; - "@esbuild/openbsd-x64-0.16.17" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz"; - sha512 = "2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg=="; - }; - }; - "@esbuild/sunos-x64-0.16.17" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz"; - sha512 = "xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw=="; - }; - }; - "@esbuild/win32-arm64-0.16.17" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz"; - sha512 = "ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw=="; - }; - }; - "@esbuild/win32-ia32-0.16.17" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz"; - sha512 = "WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig=="; - }; - }; - "@esbuild/win32-x64-0.16.17" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz"; - sha512 = "y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q=="; - }; - }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -4540,13 +4351,13 @@ let sha512 = "5HzrA5N0lSMtx2RdXfD9Z4HUFaRGwVOFs7jsFG8jDivoZjYYwZFsSqvA17TaNZYFcwBrkSCqHlxDu2YDpjjUBA=="; }; }; - "@esm2cjs/cacheable-request-10.2.5" = { + "@esm2cjs/cacheable-request-10.2.6" = { name = "_at_esm2cjs_slash_cacheable-request"; packageName = "@esm2cjs/cacheable-request"; - version = "10.2.5"; + version = "10.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.5.tgz"; - sha512 = "fen7CINhjqLjNCVtleKzDJxc1P0gLMR4KXEq5dh1CxkHZ2X8KvM0km1DwdAuLRRBusmPwgj6jqZDDtPZpIOi5Q=="; + url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.6.tgz"; + sha512 = "pttmtXI83EKjItwsigc9vbi56TnXsZekZs1AngPkIFa79EnCSPN0hX4jO45g21t0B7VaTDRZqEF/GJr1M+GUKQ=="; }; }; "@esm2cjs/form-data-encoder-2.1.4" = { @@ -4675,13 +4486,13 @@ let sha512 = "lGJOS8eAPcZhaRl5GZFIg4ZNSRY1k10wYeYXjHUbHxbZGE9lkzrATY8OvrVpcu8qQh3lvPguel63V4mrnoAuOA=="; }; }; - "@expo/apple-utils-0.0.0-alpha.34" = { + "@expo/apple-utils-0.0.0-alpha.37" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "0.0.0-alpha.34"; + version = "0.0.0-alpha.37"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.34.tgz"; - sha512 = "GRHN1xhI3Yjb76aFVLhxE7o/Pdx8D78Gm2HaRHxdFRSSdYK5lPw2/1y1/GhDH7DoXqqGwo2uQSevd6ywlj657g=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.37.tgz"; + sha512 = "/v7adya/u6GDBj7py+HsnKmA11VwG34z4/7peJdMfu8M3LZ2G14dsaxEqdndrCAuEyJ6gQ88sggjcjPjzQXdmg=="; }; }; "@expo/bunyan-4.0.0" = { @@ -4828,13 +4639,22 @@ let sha512 = "1gav4gHhZCnRDIscd0/sat/fjts543QmexiWXUWDv15uzCxx/NnewN13tcmOwMV0K3Z3agOlJLRPN2t6UvIMAg=="; }; }; - "@expo/eas-json-3.3.2" = { + "@expo/eas-build-job-0.2.103" = { + name = "_at_expo_slash_eas-build-job"; + packageName = "@expo/eas-build-job"; + version = "0.2.103"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.2.103.tgz"; + sha512 = "cstgN8sVIYjq37xHm/4E6jnAlYf1gndvWfuVzRicUjp1TVyGjV9IbilSOxJp8AEqgPZK6+bZOcMRXT634M0Nmg=="; + }; + }; + "@expo/eas-json-3.5.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "3.3.2"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.3.2.tgz"; - sha512 = "O85CbdCXUjzUOyXITpVT7qnnIqdRaaEiaY7gCeYYW4c9KUO0fNobiePKBAYTFzoSJMt5bJT9jkwKNk3dML8zkQ=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.5.0.tgz"; + sha512 = "4os4Crd5wiO2zTNnDMXCiIr7MGJaSaQGM8Uq31DLVUuIM61FCTo3KMlrC7rfkLAR1VwsqZddQN/HQIRdID81Gw=="; }; }; "@expo/image-utils-0.3.21" = { @@ -5206,85 +5026,85 @@ let sha512 = "P4ZMRFxVMnfMsOyTfBM/+nkTodLeOUfXNPo+X1bKEWBiZxRErqX/IHS5sLA0yAH8XmtKZcL7Cu6M26ztGcQYxw=="; }; }; - "@fluentui/date-time-utilities-8.5.4" = { + "@fluentui/date-time-utilities-8.5.5" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.4.tgz"; - sha512 = "PHLrbKs/s80xVkvFLQkaYb78a9nRUlohj8FCDBFQ8F1qPJj3iVH1RuSLyTiCIRJy/v1hW6KMEIXqLu/EoMefXw=="; - }; - }; - "@fluentui/dom-utilities-2.2.4" = { - name = "_at_fluentui_slash_dom-utilities"; - packageName = "@fluentui/dom-utilities"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.4.tgz"; - sha512 = "X4fN5zbvAETw9LE8bw9x5otKcpS3A3cB9wn/BookbTD4hkBESx06SzmX/WdabFq7qqbDqbURiQMpmdGUUlLsqw=="; - }; - }; - "@fluentui/font-icons-mdl2-8.5.7" = { - name = "_at_fluentui_slash_font-icons-mdl2"; - packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.7.tgz"; - sha512 = "IAZ4nLWW6JDzGsCAymLS7ncaxWpQDY48K8650IfIlcsdhxv027joQEgd+HiIIImgusMl+OS9nAQE04a68mE6Zw=="; - }; - }; - "@fluentui/foundation-legacy-8.2.27" = { - name = "_at_fluentui_slash_foundation-legacy"; - packageName = "@fluentui/foundation-legacy"; - version = "8.2.27"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.27.tgz"; - sha512 = "KIK7N6thJ9EzwQBLysavdsJHt6mnsA1O2ZHLI9d4yDQlx17EVa0aXrdsSNgqfa1czya3OmBDVQMFR2gqy38voQ=="; - }; - }; - "@fluentui/keyboard-key-0.4.4" = { - name = "_at_fluentui_slash_keyboard-key"; - packageName = "@fluentui/keyboard-key"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.4.tgz"; - sha512 = "nx0bQ9B5QtUym9a21ig5eHPt2T6EWaqrleFb37d6ImikP6xVXUHrWQJFuVS1CSg0n63KOPsmh1QvAUfxfmyLhw=="; - }; - }; - "@fluentui/merge-styles-8.5.5" = { - name = "_at_fluentui_slash_merge-styles"; - packageName = "@fluentui/merge-styles"; version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.5.tgz"; - sha512 = "+cyN28iRAn8BWlZkMSEWzXpsJJiy3wWFxdJx5UnvU3iLK1slwog94inJak/BmnQKk3dFXK9vVPtDp2s3l+2/hg=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.5.tgz"; + sha512 = "P/qfyMIF1aWPVaZvgAE0u166Rp1Rfpymv63/NKQT1o56cc5LzfWTzjD2Ey1GyA+tn6dCf7g1ZXTpKo5H+CuM4Q=="; }; }; - "@fluentui/react-8.104.8" = { + "@fluentui/dom-utilities-2.2.5" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.5.tgz"; + sha512 = "VGCtAmPU/3uj/QV4Kx7gO/H2vNrhNSB346sE7xM+bBtxj+hf/owaGTvN6/tuZ8HXQu8tjTf8+ubQ3d7D7DUIjA=="; + }; + }; + "@fluentui/font-icons-mdl2-8.5.8" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.8.tgz"; + sha512 = "HfFEie2hfci+diIFfSiu0CdNZMUCZjvAi0YsY2dVJHb9JTaFavfdVO1XHmMpn0HB+FVpp0tp5eMscPp5qblu1g=="; + }; + }; + "@fluentui/foundation-legacy-8.2.28" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.2.28"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.28.tgz"; + sha512 = "NmdbBtWroU/ND7UsaedhdIOKXXFpxmA5I+Is1DjQlAPdvuIwSAkHw+iX73cemcqrVnxPZB84iIvWfNzwquBYew=="; + }; + }; + "@fluentui/keyboard-key-0.4.5" = { + name = "_at_fluentui_slash_keyboard-key"; + packageName = "@fluentui/keyboard-key"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.5.tgz"; + sha512 = "c+B+mdEgj0B6fhYIjznesGi8Al1rTpdFNudpNmFoVjlhCle5qj5RBtM4WaT8XygdzAVQq7oHSXom0vd32+zAZg=="; + }; + }; + "@fluentui/merge-styles-8.5.6" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.6.tgz"; + sha512 = "i9Wy+7V+lKfX+UWRTrrK+3xm4aa8jl9tK2/7Ku696yWJ5v3D6xjRcMevfxUZDrZ3xS4/GRFfWKPHkAjzz/BQoQ=="; + }; + }; + "@fluentui/react-8.105.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.104.8"; + version = "8.105.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.8.tgz"; - sha512 = "FVpyhZwPfpkHcP9d7Q5lQ7PPeSD2tLPaWGCGNhPHBsD0BS/A5Sv1+XN2LN1E+wbJUIvKrdVfxoWmUqDaNlpZjg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.105.3.tgz"; + sha512 = "is2S8gvBozE3n9F9l4t5H52GVizz7qhTiQO6B8yFyqsjRSfBX3MjkHEwBzb1n2u7wIg9silKoFA8Hrh1w+/+KA=="; }; }; - "@fluentui/react-focus-8.8.13" = { + "@fluentui/react-focus-8.8.14" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.13"; + version = "8.8.14"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.13.tgz"; - sha512 = "Y9RlqjJdWB7of/GJt/M8Ezf5tP2JSFjfEqe7W6Ttjr7wxiZZr4X8hJISWOksPSzvWyc0CT5J9uPEX0IWBHFsFQ=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.14.tgz"; + sha512 = "lOhn00rSsd6gR4Z+RM1YyOZ4QWFvoF8s9Y3YeBh4rrYN5NL9ntMqKIcye6dUXx/P595kwXeKOQgUdH2LalJB4Q=="; }; }; - "@fluentui/react-hooks-8.6.15" = { + "@fluentui/react-hooks-8.6.16" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.15"; + version = "8.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.15.tgz"; - sha512 = "oh1OdXAUwPyhMRum8TU2/C8V4hb69qGFTh/XYzyfiAwa0UzODszq/LoaDyVThEJEi5OBPdeuXturAvgqCT8kNw=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.16.tgz"; + sha512 = "yWEcF7O9ZUn63TMORVBrovRr7NfNAYJ49SvhtoAdEjGIP6Tm3SgcwB0Gyo3ekYubX+XzmKRYfbu6qUFj6o8tGA=="; }; }; "@fluentui/react-portal-compat-context-9.0.4" = { @@ -5296,49 +5116,49 @@ let sha512 = "qw2lmkxZ2TmgC0pB2dvFyrzVffxBdpCx1BdWRaF+MRGUlTxRtqfybSx3Edsqa6NMewc3J0ThLMFdVFBQ5Yafqw=="; }; }; - "@fluentui/react-window-provider-2.2.5" = { + "@fluentui/react-window-provider-2.2.6" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.5.tgz"; - sha512 = "uct8xpHLFoECeoM8xRsw98yrxLV1MY2rA/Ml0M65JSWREdDUk+btgu7HLZp4QV/GpfPvP1WiNFLSLhrZFSnIAg=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.6.tgz"; + sha512 = "bcQM5mdi4ugVb30GNtde8sP173F+l9p7uQfgK/I8O07EfKHUHZeY4wj5arD53s1cUIQI0kxWJ5RD7upZNRQeQA=="; }; }; - "@fluentui/set-version-8.2.4" = { + "@fluentui/set-version-8.2.5" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.2.4"; + version = "8.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.4.tgz"; - sha512 = "v12VUrpThYcJESFrnu3LdL7/s957hoSCJ3t8C014Hp2IOmk3dnZRZJymf1k/RAOXztS4w9dF2Zhs8uP31qwcZw=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.5.tgz"; + sha512 = "DwJq9wIXLc8WkeJ/lqYM4Sv+R0Ccb6cy3cY1Bqaa5POsroVKIfL6W+njvAMOj3LO3+DaXo2aDeiUnnw70M8xIw=="; }; }; - "@fluentui/style-utilities-8.9.0" = { + "@fluentui/style-utilities-8.9.1" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.9.0"; + version = "8.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.0.tgz"; - sha512 = "n64tj38ndvT9WSwzt3tQl5MuOaRQmRBzfv7GM2dCjJ6CblWHpSV8jRXX44RnkOFr/QRCrq+gv8sEveXKsyRtag=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.1.tgz"; + sha512 = "5PQd52UxvRSlOeBaNHRvKoicPAIgd/O43mgSj5T1OmJWRUkm5/8mcc5goHMvvHwB9i7HRuJPw21sQSefPira7g=="; }; }; - "@fluentui/theme-2.6.21" = { + "@fluentui/theme-2.6.22" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.21"; + version = "2.6.22"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.21.tgz"; - sha512 = "jqPOo375pt1bQ4WuzP2GP5gfgeBK/PDHUf4+DxDTZ9y0TXp8KxV4jCp5Rq2rnVYlXi51JQ2Y+snFtMDcMTyfRQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.22.tgz"; + sha512 = "Pw8WBGeASqDHR7EliJUL26x07pASFnU5QsRBSBg6ahUxGVXRuOtROhQ3jIKXldK8/HnAIzVEPZqeTwM0yWGBVA=="; }; }; - "@fluentui/utilities-8.13.5" = { + "@fluentui/utilities-8.13.6" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.13.5"; + version = "8.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.5.tgz"; - sha512 = "YusKxwTEQmsJidEWxn8blf5ehBmBDMZDrOjQkSX4piCvi/57MfigQZ57L3Bdic8kDKsabVtS1IVMHLZzGy4zcQ=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.6.tgz"; + sha512 = "szgbLmg919h9wuQi/QVgZ5oa5qtOtc1VgyR/eMPzMW/pJHU9jc7E0L++eMYa1oaHpdsDrQ4L3wAIo6Yuk1Jczw=="; }; }; "@forge/api-2.10.0" = { @@ -5530,13 +5350,13 @@ let sha512 = "/LDNozZ+6qTS0yqMXo/ki6yJqTVx2s6ncOM/m/t4PjqeXrN8ejTwoiNDoDVZq18bsHjZBPP4o03M2goFYWJCHA=="; }; }; - "@grammyjs/types-2.11.2" = { + "@grammyjs/types-2.12.1" = { name = "_at_grammyjs_slash_types"; packageName = "@grammyjs/types"; - version = "2.11.2"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.11.2.tgz"; - sha512 = "qglunvUIL8mz/TS0vqdcg2uABwM34UkSkUQcZVWjxWH34c9ptsMvY3zO0n9P0eLBaRLV4BwnD8MBx35BN2FFNw=="; + url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.12.1.tgz"; + sha512 = "1hO6esfdo42mSvyArPHrlgSY/fgerTuVNAbSD5ZKHS/w5ZyrkA4pRp3VHK2XE3fm9/uMBT/39i8pPvx0+Kbxjg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -5566,13 +5386,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.5.15" = { + "@graphql-tools/batch-execute-8.5.16" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.5.15"; + version = "8.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.15.tgz"; - sha512 = "qb12M8XCK6SBJmZDS8Lzd4PVJFsIwNUkYmFuqcTiBqOI/WsoDlQDZI++ghRpGcusLkL9uzcIOTT/61OeHhsaLg=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.16.tgz"; + sha512 = "x/gXA6R1Q/qigT5LDesZYemErzFYvBBuTaVgiIJuE2wG6oMV1cln0O35Z7WVQw6H3I4vF7cCG7c7wKSoC+3z4Q=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -5584,49 +5404,49 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-9.0.23" = { + "@graphql-tools/delegate-9.0.25" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "9.0.23"; + version = "9.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.23.tgz"; - sha512 = "pTmC2ZUGRp/j4bwQRccZV+J2ETMeHYF9RmEXHHdj0S7/LOpyfFE3mGvRV2+n6MzXpPCPp+mh037LWF+q4wLcJw=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.25.tgz"; + sha512 = "M7DMrPx8uEjXUshkki0ufcL//9Dj12eR3vykvteFB6odYL9cX5dhZC9l1D2IdQRuHzLMskhkhRtfnXRoa82KTA=="; }; }; - "@graphql-tools/executor-0.0.12" = { + "@graphql-tools/executor-0.0.13" = { name = "_at_graphql-tools_slash_executor"; packageName = "@graphql-tools/executor"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-0.0.12.tgz"; - sha512 = "bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-0.0.13.tgz"; + sha512 = "bZ7QdUV5URLCjD/WuDkvyROYoDVoueTN5W1PatkcN949lwIwEKXUW6y3gRSpiZjXw8IH4/NmN3xPk10OT1emRw=="; }; }; - "@graphql-tools/executor-graphql-ws-0.0.7" = { + "@graphql-tools/executor-graphql-ws-0.0.9" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "0.0.7"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.7.tgz"; - sha512 = "C6EExKoukn4vu3BbvlqsqtC91F4pTLPDZvRceYjpFzTCQSGFSjfrxQGP/haGlemXVRpIDxBy7wpXoQlsF8UmFA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.9.tgz"; + sha512 = "S323OGzc8TQHOw8n7pFSl1+oG5pzhQhXRmgW6sAvA1F79FLjQ95TltEa6jSH7Jqw+tZobMyylJ13CQ1zFDjBPg=="; }; }; - "@graphql-tools/executor-http-0.1.1" = { + "@graphql-tools/executor-http-0.1.4" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "0.1.1"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-0.1.1.tgz"; - sha512 = "bFE6StI7CJEIYGRkAnTYxutSV4OtC1c4MQU3nStOYZZO7KmzIgEQZ4ygPSPrRb+jtRsMCBEqPqlYOD4Rq02aMw=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-0.1.4.tgz"; + sha512 = "6NGxLA9Z/cSOLExxfgddXqoS9JHr0QzvC4YmrjeMz533eW/SDnCf+4803PxkLi0j5CUTUPBnt9hC79l1AD2rZQ=="; }; }; - "@graphql-tools/executor-legacy-ws-0.0.6" = { + "@graphql-tools/executor-legacy-ws-0.0.7" = { name = "_at_graphql-tools_slash_executor-legacy-ws"; packageName = "@graphql-tools/executor-legacy-ws"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.6.tgz"; - sha512 = "L1hRuSvBUCNerYDhfeSZXFeqliDlnNXa3fDHTp7efI3Newpbevqa19Fm0mVzsCL7gqIKOwzrPORwh7kOVE/vew=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.7.tgz"; + sha512 = "tSBJE/uv/r0iQjsU16QZkRLLCT0cmVWPqn8NVuAp3yqEeYlU7bzf38L4wNYTn46OHIYElFxXBFsGgMdyvrQLzg=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -5638,22 +5458,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.5.14" = { + "@graphql-tools/graphql-file-loader-7.5.15" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.5.14"; + version = "7.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.14.tgz"; - sha512 = "JGer4g57kq4wtsvqv8uZsT4ZG1lLsz1x5yHDfSj2OxyiWw2f1jFkzgby7Ut3H2sseJiQzeeDYZcbm06qgR32pg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.15.tgz"; + sha512 = "K6yOfKkQdXQRBl+UY4FzGdoSzGG09GLPZv4q7OFp8do16CXhaxAI+kmJvsvrutSyBfLETPTkCHtzFmdRmTeLpg=="; }; }; - "@graphql-tools/import-6.7.15" = { + "@graphql-tools/import-6.7.16" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.7.15"; + version = "6.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.15.tgz"; - sha512 = "WNhvauAt2I2iUg+JdQK5oQebKLXqUZWe8naP13K1jOkbTQT7hK3P/4I9AaVmzt0KXRJW5Uow3RgdHZ7eUBKVsA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.16.tgz"; + sha512 = "m07u+8YsBtKg5w5BG04KFTd59PCAPMAy5Dv/NlR4zCiH/Zbpy5PoetokCZKDrFHYUzjPlm8r//vfCG+JTvHw7g=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -5665,13 +5485,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.4.15" = { + "@graphql-tools/json-file-loader-7.4.16" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.4.15"; + version = "7.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.15.tgz"; - sha512 = "pH+hbsDetcEpj+Tmi7ZRUkxzJez2DLdSQuvK5Qi38FX/Nz/5nZKRfW9nqIptGYbuS9+2JPrt9WWNn1aGtegIFQ=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.16.tgz"; + sha512 = "9MsqpwIrCx0l880V0dud01DhkwYwqCIlZlCA3bN+TExWa9U3aZhyPO/5BWQU6W52wKk61TvyN6agUa+f4R7jVQ=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -5683,13 +5503,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.8.10" = { + "@graphql-tools/load-7.8.11" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.8.10"; + version = "7.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.10.tgz"; - sha512 = "Mc1p7ZSxrW5yGG3BLQnhiL8RPG0HdxFVoHV7fpx2adp4o1V7BzDjKRSbCnAxShA1wA4n8wbA+n7NTC0edi4eNA=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.11.tgz"; + sha512 = "pVn3fYP/qZ3m2NE86gSexyZpEmvTSUe+OIRfWBM60a4L/SycMxgVfYB5+PyDCzruFZg/didIG3v7RfPlZ7zNTQ=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -5710,22 +5530,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.3.16" = { + "@graphql-tools/merge-8.3.17" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.3.16"; + version = "8.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.16.tgz"; - sha512 = "In0kcOZcPIpYOKaqdrJ3thdLPE7TutFnL9tbrHUy2zCinR2O/blpRC48jPckcs0HHrUQ0pGT4HqvzMkZUeEBAw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.17.tgz"; + sha512 = "CLzz49lc6BavPhH9gPRm0sJeNA7kC/tF/jLUTQsyef6xj82Jw3rqIJ9PE+bk1cqPCOG01WLOfquBu445OMDO2g=="; }; }; - "@graphql-tools/mock-8.7.16" = { + "@graphql-tools/mock-8.7.17" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.7.16"; + version = "8.7.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.16.tgz"; - sha512 = "g1BcIk6OKeqDwezbn6QOQ+UkbzfZDvcolomXOoGTaE+KNw5JV9EKKIt1COyWtKeNrwtIdPPBS/zcLAqOw1MUdQ=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.17.tgz"; + sha512 = "yo3o2fxii3lQ+xwht6ZSYukPb+k81WXmfTX+1TTvj2ylSVuAdFpfRDQrACAqXRDPtXqCWvknN1ReRmnrOpUHrg=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5746,13 +5566,13 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.14" = { + "@graphql-tools/schema-9.0.15" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "9.0.14"; + version = "9.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.14.tgz"; - sha512 = "U6k+HY3Git+dsOEhq+dtWQwYg2CAgue8qBvnBXoKu5eEeH284wymMUoNm0e4IycOgMCJANVhClGEBIkLRu3FQQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.15.tgz"; + sha512 = "p2DbpkOBcsi+yCEjwoS+r4pJ5z+3JjlJdhbPkCwC4q8lGf5r93dVYrExOrqGKTU5kxLXI/mxabSxcunjNIsDIg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -5764,13 +5584,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.17.4" = { + "@graphql-tools/url-loader-7.17.9" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.17.4"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.4.tgz"; - sha512 = "nB2fhkn4LTYjU2qoTOBZYmWQRVYsCI0K2LScwD49QVMNAPWthg/lHao4hFUe70aTInT8oquvl8d0rIb7fRWOvA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.9.tgz"; + sha512 = "qAXQ9Tr/Am2hEelGVLCfO/YOyCMzCd4FyWMRRqcoMYIaK91arIb5X13pgILD28SUN+6H3NDsx7fgq/Z/OhwGrQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5818,13 +5638,13 @@ let sha512 = "pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg=="; }; }; - "@graphql-tools/utils-9.1.4" = { + "@graphql-tools/utils-9.2.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "9.1.4"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.1.4.tgz"; - sha512 = "hgIeLt95h9nQgQuzbbdhuZmh+8WV7RZ/6GbTj6t3IU4Zd2zs9yYJ2jgW/krO587GMOY8zCwrjNOMzD40u3l7Vg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.2.0.tgz"; + sha512 = "s3lEG1iYkyYEnKCWrIFECX3XH2wmZvbg6Ir3udCvIDynq+ydaO7JQXobclpPtwSJtjlS353haF//6V7mnBQ4bg=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -5836,13 +5656,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-9.3.2" = { + "@graphql-tools/wrap-9.3.4" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "9.3.2"; + version = "9.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.2.tgz"; - sha512 = "jqBMJZyKFATxWA3alPhGRWh/ZluaPWrXFumXRaqAwK9QdCAxM24jG8Kmy3FrTfeyxNqDyzDlHZobtwwDKurm5g=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.4.tgz"; + sha512 = "MJY6lZqi+j96izjOYOLk5fys34oiLt7U34SQ4Wd6V/sy1utVMbh2H7XiZAuDJ38JIKmr72qN7kLgNcnNOxXjHQ=="; }; }; "@graphql-typed-document-node/core-3.1.1" = { @@ -5854,15 +5674,6 @@ let sha512 = "NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg=="; }; }; - "@grpc/grpc-js-1.7.3" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz"; - sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; - }; - }; "@grpc/grpc-js-1.8.1" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -5881,6 +5692,15 @@ let sha512 = "oaETBotls7FTBpySg5dhyUCyXSxSeCMmkBBXHXG1iw57MiNoB6D7VRhkrXYbwyHM3Q3Afjp4KlsBX0Zb+ELZXw=="; }; }; + "@grpc/grpc-js-1.8.7" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.7.tgz"; + sha512 = "dRAWjRFN1Zy9mzPNLkFFIWT8T6C9euwluzCHZUKuhC+Bk3MayNPcpgDRyG+sg+n2sitEUySKxUynirVpu9ItKw=="; + }; + }; "@grpc/proto-loader-0.7.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -6304,283 +6124,283 @@ let sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; - "@jimp/bmp-0.16.2" = { + "@jimp/bmp-0.16.13" = { name = "_at_jimp_slash_bmp"; packageName = "@jimp/bmp"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.2.tgz"; - sha512 = "4g9vW45QfMoGhLVvaFj26h4e7cC+McHUQwyFQmNTLW4FfC1OonN9oUr2m/FEDGkTYKR7aqdXR5XUqqIkHWLaFw=="; + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.13.tgz"; + sha512 = "9edAxu7N2FX7vzkdl5Jo1BbACfycUtBQX+XBMcHA2bk62P8R0otgkHg798frgAk/WxQIzwxqOH6wMiCwrlAzdQ=="; }; }; - "@jimp/core-0.16.2" = { + "@jimp/core-0.16.13" = { name = "_at_jimp_slash_core"; packageName = "@jimp/core"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/core/-/core-0.16.2.tgz"; - sha512 = "dp7HcyUMzjXphXYodI6PaXue+I9PXAavbb+AN+1XqFbotN22Z12DosNPEyy+UhLY/hZiQQqUkEaJHkvV31rs+w=="; + url = "https://registry.npmjs.org/@jimp/core/-/core-0.16.13.tgz"; + sha512 = "qXpA1tzTnlkTku9yqtuRtS/wVntvE6f3m3GNxdTdtmc+O+Wcg9Xo2ABPMh7Nc0AHbMKzwvwgB2JnjZmlmJEObg=="; }; }; - "@jimp/custom-0.16.2" = { + "@jimp/custom-0.16.13" = { name = "_at_jimp_slash_custom"; packageName = "@jimp/custom"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.2.tgz"; - sha512 = "GtNwOs4hcVS2GIbqRUf42rUuX07oLB92cj7cqxZb0ZGWwcwhnmSW0TFLAkNafXmqn9ug4VTpNvcJSUdiuECVKg=="; + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.13.tgz"; + sha512 = "LTATglVUPGkPf15zX1wTMlZ0+AU7cGEGF6ekVF1crA8eHUWsGjrYTB+Ht4E3HTrCok8weQG+K01rJndCp/l4XA=="; }; }; - "@jimp/gif-0.16.2" = { + "@jimp/gif-0.16.13" = { name = "_at_jimp_slash_gif"; packageName = "@jimp/gif"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.2.tgz"; - sha512 = "TMdyT9Q0paIKNtT7c5KzQD29CNCsI/t8ka28jMrBjEK7j5RRTvBfuoOnHv7pDJRCjCIqeUoaUSJ7QcciKic6CA=="; + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.13.tgz"; + sha512 = "yFAMZGv3o+YcjXilMWWwS/bv1iSqykFahFMSO169uVMtfQVfa90kt4/kDwrXNR6Q9i6VHpFiGZMlF2UnHClBvg=="; }; }; - "@jimp/jpeg-0.16.2" = { + "@jimp/jpeg-0.16.13" = { name = "_at_jimp_slash_jpeg"; packageName = "@jimp/jpeg"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.2.tgz"; - sha512 = "BW5gZydgq6wdIwHd+3iUNgrTklvoQc/FUKSj9meM6A0FU21lUaansRX5BDdJqHkyXJLnnlDGwDt27J+hQuBAVw=="; + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.13.tgz"; + sha512 = "BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA=="; }; }; - "@jimp/plugin-blit-0.16.2" = { + "@jimp/plugin-blit-0.16.13" = { name = "_at_jimp_slash_plugin-blit"; packageName = "@jimp/plugin-blit"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.2.tgz"; - sha512 = "Z31rRfV80gC/r+B/bOPSVVpJEWXUV248j7MdnMOFLu4vr8DMqXVo9jYqvwU/s4LSTMAMXqm4Jg6E/jQfadPKAg=="; + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.13.tgz"; + sha512 = "8Z1k96ZFxlhK2bgrY1JNWNwvaBeI/bciLM0yDOni2+aZwfIIiC7Y6PeWHTAvjHNjphz+XCt01WQmOYWCn0ML6g=="; }; }; - "@jimp/plugin-blur-0.16.2" = { + "@jimp/plugin-blur-0.16.13" = { name = "_at_jimp_slash_plugin-blur"; packageName = "@jimp/plugin-blur"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.2.tgz"; - sha512 = "ShkJCAzRI+1fAKPuLLgEkixpSpVmKTYaKEFROUcgmrv9AansDXGNCupchqVMTdxf8zPyW8rR1ilvG3OJobufLQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.13.tgz"; + sha512 = "PvLrfa8vkej3qinlebyhLpksJgCF5aiysDMSVhOZqwH5nQLLtDE9WYbnsofGw4r0VVpyw3H/ANCIzYTyCtP9Cg=="; }; }; - "@jimp/plugin-circle-0.16.2" = { + "@jimp/plugin-circle-0.16.13" = { name = "_at_jimp_slash_plugin-circle"; packageName = "@jimp/plugin-circle"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.2.tgz"; - sha512 = "6T4z/48F4Z5+YwAVCLOvXQcyGmo0E3WztxCz6XGQf66r4JJK78+zcCDYZFLMx0BGM0091FogNK4QniP8JaOkrA=="; + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.13.tgz"; + sha512 = "RNave7EFgZrb5V5EpdvJGAEHMnDAJuwv05hKscNfIYxf0kR3KhViBTDy+MoTnMlIvaKFULfwIgaZWzyhuINMzA=="; }; }; - "@jimp/plugin-color-0.16.2" = { + "@jimp/plugin-color-0.16.13" = { name = "_at_jimp_slash_plugin-color"; packageName = "@jimp/plugin-color"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.2.tgz"; - sha512 = "6oBV0g0J17/7E+aTquvUsgSc85nUbUi+64tIK5eFIDzvjhlqhjGNJYlc46KJMCWIs61qRJayQoZdL/iT/iQuGQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.13.tgz"; + sha512 = "xW+9BtEvoIkkH/Wde9ql4nAFbYLkVINhpgAE7VcBUsuuB34WUbcBl/taOuUYQrPEFQJ4jfXiAJZ2H/rvKjCVnQ=="; }; }; - "@jimp/plugin-contain-0.16.2" = { + "@jimp/plugin-contain-0.16.13" = { name = "_at_jimp_slash_plugin-contain"; packageName = "@jimp/plugin-contain"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.2.tgz"; - sha512 = "pLcxO3hVN3LCEhMNvpZ9B7xILHVlS433Vv16zFFJxLRqZdYvPLsc+ZzJhjAiHHuEjVblQrktHE3LGeQwGJPo0w=="; + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.13.tgz"; + sha512 = "QayTXw4tXMwU6q6acNTQrTTFTXpNRBe+MgTGMDU0lk+23PjlFCO/9sacflelG8lsp7vNHhAxFeHptDMAksEYzg=="; }; }; - "@jimp/plugin-cover-0.16.2" = { + "@jimp/plugin-cover-0.16.13" = { name = "_at_jimp_slash_plugin-cover"; packageName = "@jimp/plugin-cover"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.2.tgz"; - sha512 = "gzWM7VvYeI8msyiwbUZxH+sGQEgO6Vd6adGxZ0CeKX00uQOe5lDzxb1Wjx7sHcJGz8a/5fmAuwz7rdDtpDUbkw=="; + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.13.tgz"; + sha512 = "BSsP71GTNaqWRcvkbWuIVH+zK7b3TSNebbhDkFK0fVaUTzHuKMS/mgY4hDZIEVt7Rf5FjadAYtsujHN9w0iSYA=="; }; }; - "@jimp/plugin-crop-0.16.2" = { + "@jimp/plugin-crop-0.16.13" = { name = "_at_jimp_slash_plugin-crop"; packageName = "@jimp/plugin-crop"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.2.tgz"; - sha512 = "qCd3hfMEE+Z2EuuyXewgXRTtKJGIerWzc1zLEJztsUkPz5i73IGgkOL+mrNutZwGaXZbm+8SwUaGb46sxAO6Tw=="; + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.13.tgz"; + sha512 = "WEl2tPVYwzYL8OKme6Go2xqiWgKsgxlMwyHabdAU4tXaRwOCnOI7v4021gCcBb9zn/oWwguHuKHmK30Fw2Z/PA=="; }; }; - "@jimp/plugin-displace-0.16.2" = { + "@jimp/plugin-displace-0.16.13" = { name = "_at_jimp_slash_plugin-displace"; packageName = "@jimp/plugin-displace"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.2.tgz"; - sha512 = "6nXdvNNjCdD95v2o3/jPeur903dz08lG4Y8gmr5oL2yVv9LSSbMonoXYrR/ASesdyXqGdXJLU4NL+yZs4zUqbQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.13.tgz"; + sha512 = "qt9WKq8vWrcjySa9DyQ0x/RBMHQeiVjdVSY1SJsMjssPUf0pS74qorcuAkGi89biN3YoGUgPkpqECnAWnYwgGA=="; }; }; - "@jimp/plugin-dither-0.16.2" = { + "@jimp/plugin-dither-0.16.13" = { name = "_at_jimp_slash_plugin-dither"; packageName = "@jimp/plugin-dither"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.2.tgz"; - sha512 = "DERpIzy21ZanMkVsD0Tdy8HQLbD1E41OuvIzaMRoW4183PA6AgGNlrQoFTyXmzjy6FTy1SxaQgTEdouInAWZ9Q=="; + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.13.tgz"; + sha512 = "5/N3yJggbWQTlGZHQYJPmQXEwR52qaXjEzkp1yRBbtdaekXE3BG/suo0fqeoV/csf8ooI78sJzYmIrxNoWVtgQ=="; }; }; - "@jimp/plugin-fisheye-0.16.2" = { + "@jimp/plugin-fisheye-0.16.13" = { name = "_at_jimp_slash_plugin-fisheye"; packageName = "@jimp/plugin-fisheye"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.2.tgz"; - sha512 = "Df7PsGIwiIpQu3EygYCnaJyTfOwvwtYV3cmYJS7yFLtdiFUuod+hlSo5GkwEPLAy+QBxhUbDuUqnsWo4NQtbiQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.13.tgz"; + sha512 = "2rZmTdFbT/cF9lEZIkXCYO0TsT114Q27AX5IAo0Sju6jVQbvIk1dFUTnwLDadTo8wkJlFzGqMQ24Cs8cHWOliA=="; }; }; - "@jimp/plugin-flip-0.16.2" = { + "@jimp/plugin-flip-0.16.13" = { name = "_at_jimp_slash_plugin-flip"; packageName = "@jimp/plugin-flip"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.2.tgz"; - sha512 = "+2uC8ioVQUr06mnjSWraskz2L33nJHze35LkQ8ZNsIpoZLkgvfiWatqAs5bj+1jGI/9kxoCFAaT1Is0f+a4/rw=="; + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.13.tgz"; + sha512 = "EmcgAA74FTc5u7Z+hUO/sRjWwfPPLuOQP5O64x5g4j0T12Bd29IgsYZxoutZo/rb3579+JNa/3wsSEmyVv1EpA=="; }; }; - "@jimp/plugin-gaussian-0.16.2" = { + "@jimp/plugin-gaussian-0.16.13" = { name = "_at_jimp_slash_plugin-gaussian"; packageName = "@jimp/plugin-gaussian"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.2.tgz"; - sha512 = "2mnuDSg4ZEH8zcJig7DZZf4st/cYmQ5UYJKP76iGhZ+6JDACk6uejwAgT5xHecNhkVAaXMdCybA2eknH/9OE1w=="; + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.13.tgz"; + sha512 = "A1XKfGQD0iDdIiKqFYi8nZMv4dDVYdxbrmgR7y/CzUHhSYdcmoljLIIsZZM3Iks/Wa353W3vtvkWLuDbQbch1w=="; }; }; - "@jimp/plugin-invert-0.16.2" = { + "@jimp/plugin-invert-0.16.13" = { name = "_at_jimp_slash_plugin-invert"; packageName = "@jimp/plugin-invert"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.2.tgz"; - sha512 = "xFvHbVepTY/nus+6yXiYN1iq+UBRkT0MdnObbiQPstUrAsz0Imn6MWISsnAyMvcNxHGrxaxjuU777JT/esM0gg=="; + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.13.tgz"; + sha512 = "xFMrIn7czEZbdbMzZWuaZFnlLGJDVJ82y5vlsKsXRTG2kcxRsMPXvZRWHV57nSs1YFsNqXSbrC8B98n0E32njQ=="; }; }; - "@jimp/plugin-mask-0.16.2" = { + "@jimp/plugin-mask-0.16.13" = { name = "_at_jimp_slash_plugin-mask"; packageName = "@jimp/plugin-mask"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.2.tgz"; - sha512 = "AbdO85xxhfgEDdxYKpUotEI9ixiCMaIpfYHD5a5O/VWeimz2kuwhcrzlHGiyq1kKAgRcl0WEneTCZAHVSyvPKA=="; + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.13.tgz"; + sha512 = "wLRYKVBXql2GAYgt6FkTnCfE+q5NomM7Dlh0oIPGAoMBWDyTx0eYutRK6PlUrRK2yMHuroAJCglICTbxqGzowQ=="; }; }; - "@jimp/plugin-normalize-0.16.2" = { + "@jimp/plugin-normalize-0.16.13" = { name = "_at_jimp_slash_plugin-normalize"; packageName = "@jimp/plugin-normalize"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.2.tgz"; - sha512 = "+ItBWFwmB0Od7OfOtTYT1gm543PpHUgU8/DN55z83l1JqS0OomDJAe7BmCppo2405TN6YtVm/csXo7p4iWd/SQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.13.tgz"; + sha512 = "3tfad0n9soRna4IfW9NzQdQ2Z3ijkmo21DREHbE6CGcMIxOSvfRdSvf1qQPApxjTSo8LTU4MCi/fidx/NZ0GqQ=="; }; }; - "@jimp/plugin-print-0.16.2" = { + "@jimp/plugin-print-0.16.13" = { name = "_at_jimp_slash_plugin-print"; packageName = "@jimp/plugin-print"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.2.tgz"; - sha512 = "ifTGEeJ5UZTCiqC70HMeU3iXk/vsOmhWiwVGOXSFXhFeE8ZpDWvlmBsrMYnRrJGuaaogHOIrrQPI+kCdDBSBIQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.13.tgz"; + sha512 = "0m6i3p01PGRkGAK9r53hDYrkyMq+tlhLOIbsSTmZyh6HLshUKlTB7eXskF5OpVd5ZUHoltlNc6R+ggvKIzxRFw=="; }; }; - "@jimp/plugin-resize-0.16.2" = { + "@jimp/plugin-resize-0.16.13" = { name = "_at_jimp_slash_plugin-resize"; packageName = "@jimp/plugin-resize"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.2.tgz"; - sha512 = "gE4N9l6xuwzacFZ2EPCGZCJ/xR+aX2V7GdMndIl/6kYIw5/eib1SFuF9AZLvIPSFuE1FnGo8+vT0pr++SSbhYg=="; + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.13.tgz"; + sha512 = "qoqtN8LDknm3fJm9nuPygJv30O3vGhSBD2TxrsCnhtOsxKAqVPJtFVdGd/qVuZ8nqQANQmTlfqTiK9mVWQ7MiQ=="; }; }; - "@jimp/plugin-rotate-0.16.2" = { + "@jimp/plugin-rotate-0.16.13" = { name = "_at_jimp_slash_plugin-rotate"; packageName = "@jimp/plugin-rotate"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.2.tgz"; - sha512 = "/CTEYkR1HrgmnE0VqPhhbBARbDAfFX590LWGIpxcYIYsUUGQCadl+8Qo4UX13FH0Nt8UHEtPA+O2x08uPYg9UA=="; + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.13.tgz"; + sha512 = "Ev+Jjmj1nHYw897z9C3R9dYsPv7S2/nxdgfFb/h8hOwK0Ovd1k/+yYS46A0uj/JCKK0pQk8wOslYBkPwdnLorw=="; }; }; - "@jimp/plugin-scale-0.16.2" = { + "@jimp/plugin-scale-0.16.13" = { name = "_at_jimp_slash_plugin-scale"; packageName = "@jimp/plugin-scale"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.2.tgz"; - sha512 = "3inuxfrlquyLaqFdiiiQNJUurR0WbvN5wAf1qcYX2LubG1AG8grayYD6H7XVoxfUGTZXh1kpmeirEYlqA2zxcw=="; + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.13.tgz"; + sha512 = "05POQaEJVucjTiSGMoH68ZiELc7QqpIpuQlZ2JBbhCV+WCbPFUBcGSmE7w4Jd0E2GvCho/NoMODLwgcVGQA97A=="; }; }; - "@jimp/plugin-shadow-0.16.2" = { + "@jimp/plugin-shadow-0.16.13" = { name = "_at_jimp_slash_plugin-shadow"; packageName = "@jimp/plugin-shadow"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.2.tgz"; - sha512 = "Q0aIs2/L6fWMcEh9Ms73u34bT1hyUMw/oxaVoIzOLo6/E8YzCs2Bi63H0/qaPS0MQpEppI++kvosPbblABY79w=="; + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.13.tgz"; + sha512 = "nmu5VSZ9hsB1JchTKhnnCY+paRBnwzSyK5fhkhtQHHoFD5ArBQ/5wU8y6tCr7k/GQhhGq1OrixsECeMjPoc8Zw=="; }; }; - "@jimp/plugin-threshold-0.16.2" = { + "@jimp/plugin-threshold-0.16.13" = { name = "_at_jimp_slash_plugin-threshold"; packageName = "@jimp/plugin-threshold"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.2.tgz"; - sha512 = "gyOwmBgjtMPvcuyOhkP6dOGWbQdaTfhcBRN22mYeI/k/Wh/Zh1OI21F6eKLApsVRmg15MoFnkrCz64RROC34sw=="; + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.13.tgz"; + sha512 = "+3zArBH0OE3Rhjm4HyAokMsZlIq5gpQec33CncyoSwxtRBM2WAhUVmCUKuBo+Lr/2/4ISoY4BWpHKhMLDix6cA=="; }; }; - "@jimp/plugins-0.16.2" = { + "@jimp/plugins-0.16.13" = { name = "_at_jimp_slash_plugins"; packageName = "@jimp/plugins"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.2.tgz"; - sha512 = "zCvYtCgctmC0tkYEu+y+kSwSIZBsNznqJ3/3vkpzxdyjd6wCfNY5Qc/68MPrLc1lmdeGo4cOOTYHG7Vc6myzRw=="; + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.13.tgz"; + sha512 = "CJLdqODEhEVs4MgWCxpWL5l95sCBlkuSLz65cxEm56X5akIsn4LOlwnKoSEZioYcZUBvHhCheH67AyPTudfnQQ=="; }; }; - "@jimp/png-0.16.2" = { + "@jimp/png-0.16.13" = { name = "_at_jimp_slash_png"; packageName = "@jimp/png"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/png/-/png-0.16.2.tgz"; - sha512 = "sFOtOSz/tzDwXEChFQ/Nxe+0+vG3Tj0eUxnZVDUG/StXE9dI8Bqmwj3MIa0EgK5s+QG3YlnDOmlPUa4JqmeYeQ=="; + url = "https://registry.npmjs.org/@jimp/png/-/png-0.16.13.tgz"; + sha512 = "8cGqINvbWJf1G0Her9zbq9I80roEX0A+U45xFby3tDWfzn+Zz8XKDF1Nv9VUwVx0N3zpcG1RPs9hfheG4Cq2kg=="; }; }; - "@jimp/tiff-0.16.2" = { + "@jimp/tiff-0.16.13" = { name = "_at_jimp_slash_tiff"; packageName = "@jimp/tiff"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.2.tgz"; - sha512 = "ADcdqmtZF+U2YoaaHTzFX8D6NFpmN4WZUT0BPMerEuY7Cq8QoLYU22z2h034FrVW+Rbi1b3y04sB9iDiQAlf2w=="; + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.13.tgz"; + sha512 = "oJY8d9u95SwW00VPHuCNxPap6Q1+E/xM5QThb9Hu+P6EGuu6lIeLaNBMmFZyblwFbwrH+WBOZlvIzDhi4Dm/6Q=="; }; }; - "@jimp/types-0.16.2" = { + "@jimp/types-0.16.13" = { name = "_at_jimp_slash_types"; packageName = "@jimp/types"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/types/-/types-0.16.2.tgz"; - sha512 = "0Ue5Sq0XnDF6TirisWv5E+8uOnRcd8vRLuwocJOhF76NIlcQrz+5r2k2XWKcr3d+11n28dHLXW5TKSqrUopxhA=="; + url = "https://registry.npmjs.org/@jimp/types/-/types-0.16.13.tgz"; + sha512 = "mC0yVNUobFDjoYLg4hoUwzMKgNlxynzwt3cDXzumGvRJ7Kb8qQGOWJQjQFo5OxmGExqzPphkirdbBF88RVLBCg=="; }; }; - "@jimp/utils-0.16.2" = { + "@jimp/utils-0.16.13" = { name = "_at_jimp_slash_utils"; packageName = "@jimp/utils"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.2.tgz"; - sha512 = "XENrPvmigiXZQ8E2nxJqO6UVvWBLzbNwyYi3Y8Q1IECoYhYI3kgOQ0fmy4G269Vz1V0omh1bNmC42r4OfXg1Jg=="; + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.13.tgz"; + sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA=="; }; }; "@joplin/fork-htmlparser2-4.1.41" = { @@ -6781,22 +6601,22 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.73.0" = { + "@jsii/check-node-1.74.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.73.0.tgz"; - sha512 = "oneDKgjplUw2Ivk78iAb9lCsAasxkuQ6Ii15qzXsw16CPSRCqQlE78lUVV7pr+rxx/vQDWBAa8ycRbuVghC6TQ=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.74.0.tgz"; + sha512 = "1vNR0eGy8A15A+wlgYFpnjjUtiKLvizZse8THH7UR9Apa9lF68fd3A6ZHiHIu1Rz7PrdH2AoIR4YC8mwqu9e8g=="; }; }; - "@jsii/spec-1.73.0" = { + "@jsii/spec-1.74.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.73.0.tgz"; - sha512 = "h0BeA6WQfxvYl5BaacmlvB5bAIdhlgf9SInJljxtERn2eYN+VjgMyU/1iv0Ww4Lp71xMGL96bmfXpdlFgRQFEg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.74.0.tgz"; + sha512 = "+Kfh7Xdvt6rmZ/W3OhOQq4iWcoZvvYwbfOm0NB7uF70q20LYaKMvLKaYWPTlxSZTrkScZwHrIFTryLlJ/e/v+w=="; }; }; "@json2csv/formatters-6.1.2" = { @@ -7897,13 +7717,13 @@ let sha512 = "W+IzEBw8a6LOOfRJM02dTT7BDZijxm+Z7lhtOAz1+y9vQm1Kdz9jlAO+qCEKsfxtUOmKilW8DIRqFw2aUgKeGg=="; }; }; - "@microsoft/rush-lib-5.89.1" = { + "@microsoft/rush-lib-5.90.0" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.89.1"; + version = "5.90.0"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.89.1.tgz"; - sha512 = "yOzZ6LY0OkAp9pUB3mVA8wjWsQ1bnRRrBYpmho5/Cy3TM6cUgjdPUhEzpx4THbu8lcYtdvJ10Ivki4V1rI6Qdg=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.90.0.tgz"; + sha512 = "KzodKZzK+lgcvVdJGu4XnR3NJgw1lh7gTION8YyIBSlXAqseeB/5m461hIUemXJYroi4QbDiU84ELpLvk14mJg=="; }; }; "@miniflare/cache-2.11.0" = { @@ -8131,58 +7951,58 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-arm64"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz"; - sha512 = "Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.0.tgz"; + sha512 = "5qpnNHUyyEj9H3sm/4Um/bnx1lrQGhe8iqry/1d+cQYCRd/gzYA0YLeq0ezlk4hKx4vO+dsEsNyeowqRqslwQA=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-x64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-x64"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz"; - sha512 = "vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.0.tgz"; + sha512 = "ZphTFFd6SFweNAMKD+QJCrWpgkjf4qBuHltiMkKkD6FFrB3NOTRVmetAGTkJ57pa+s6J0yCH06LujWB9rZe94g=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-linux-arm-3.0.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz"; - sha512 = "SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.0.tgz"; + sha512 = "ztKVV1dO/sSZyGse0PBCq3Pk1PkYjsA/dsEWE7lfrGoAK3i9HpS2o7XjGQ7V4va6nX+xPPOiuYpQwa4Bi6vlww=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm64"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz"; - sha512 = "hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.0.tgz"; + sha512 = "NEX6hdSvP4BmVyegaIbrGxvHzHvTzzsPaxXCsUt0mbLbPpEftsvNwaEVKOowXnLoeuGeD4MaqSwL3BUK2elsUA=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-linux-x64-3.0.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-x64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-x64"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz"; - sha512 = "94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.0.tgz"; + sha512 = "9uvdAkZMOPCY7SPRxZLW8XGqBOVNVEhqlgffenN8shA1XR9FWVsSM13nr/oHtNgXg6iVyML7RwWPyqUeThlwxg=="; }; }; - "@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-win32-x64-3.0.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-win32-x64"; packageName = "@msgpackr-extract/msgpackr-extract-win32-x64"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz"; - sha512 = "XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.0.tgz"; + sha512 = "Wg0+9615kHKlr9iLVcG5I+/CHnf6w3x5UADRv8Ad16yA0Bu5l9eVOROjV7aHPG6uC8ZPFIVVaoSjDChD+Y0pzg=="; }; }; "@nestjs/schematics-9.0.4" = { @@ -8455,13 +8275,13 @@ let sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; }; }; - "@npmcli/config-6.1.1" = { + "@npmcli/config-6.1.2" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-6.1.1.tgz"; - sha512 = "R09ig+5UGrA1lxTWMyfyUwwzR9OAtJwMHGF4opu0/ysM3nMujzVvp0DVD/BnbmcQ0w6jM4IrsCSsq6ZdcvLW/Q=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-6.1.2.tgz"; + sha512 = "4Hme9jhshXF0xOV64II5GmwtuCZWOlHT9zcqBPzfrIJ0AYb8/EfUtIu4LQxOWFojGdstTrGZLNHktvl9V6M9+A=="; }; }; "@npmcli/fs-1.1.1" = { @@ -8788,6 +8608,15 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; + "@oclif/config-1.18.8" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.8.tgz"; + sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg=="; + }; + }; "@oclif/core-1.23.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; @@ -9202,31 +9031,31 @@ let sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; }; }; - "@opentelemetry/core-1.9.0" = { + "@opentelemetry/core-1.9.1" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.9.0.tgz"; - sha512 = "Koy1ApRUp5DB5KpOqhDk0JjO9x6QeEkmcePl8qQDsXZGF4MuHUBShXibd+J2tRNckTsvgEHi1uEuUckDgN+c/A=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.9.1.tgz"; + sha512 = "6/qon6tw2I8ZaJnHAQUUn4BqhTbTNRS0WP8/bA0ynaX+Uzp/DDbd0NS0Cq6TMlh8+mrlsyqDE7mO50nmv2Yvlg=="; }; }; - "@opentelemetry/resources-1.9.0" = { + "@opentelemetry/resources-1.9.1" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.9.0.tgz"; - sha512 = "zCyien0p3XWarU6zv72c/JZ6QlG5QW/hc61Nh5TSR1K9ndnljzAGrH55x4nfyQdubfoh9QxLNh9FXH0fWK6vcg=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.9.1.tgz"; + sha512 = "VqBGbnAfubI+l+yrtYxeLyOoL358JK57btPMJDd3TCOV3mV5TNBmzvOfmesM4NeTyXuGJByd3XvOHvFezLn3rQ=="; }; }; - "@opentelemetry/sdk-trace-base-1.9.0" = { + "@opentelemetry/sdk-trace-base-1.9.1" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.0.tgz"; - sha512 = "glNgtJjxAIrDku8DG5Xu3nBK25rT+hkyg7yuXh8RUurp/4BcsXjMyVqpyJvb2kg+lxAX73VJBhncRKGHn9t8QQ=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.1.tgz"; + sha512 = "Y9gC5M1efhDLYHeeo2MWcDDMmR40z6QpqcWnPCm4Dmh+RHAMf4dnEBBntIe1dDpor686kyU6JV1D29ih1lZpsQ=="; }; }; "@opentelemetry/semantic-conventions-1.3.1" = { @@ -9238,13 +9067,13 @@ let sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; - "@opentelemetry/semantic-conventions-1.9.0" = { + "@opentelemetry/semantic-conventions-1.9.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.0.tgz"; - sha512 = "po7penSfQ/Z8352lRVDpaBrd9znwA5mHGqXR7nDEiVnxkDFkBIhVf/tKeAJDIq/erFpcRowKFeCsr5eqqcSyFQ=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.1.tgz"; + sha512 = "oPQdbFDmZvjXk5ZDoBGXG8B4tSB/qW5vQunJWQMFUBp7Xe8O1ByPANueJ+Jzg58esEBegyyxZ7LRmfJr7kFcFg=="; }; }; "@orval/angular-6.11.1" = { @@ -9301,330 +9130,6 @@ let sha512 = "Oi/cgNzFWU0ukXoq5RselfJLcoy9l+MmLpmgnqTghXewRq67q1iIc5ee5/8Kf9m36dLCfb7uk8m1i3e6F5LhwA=="; }; }; - "@ot-builder/bin-composite-types-1.6.1" = { - name = "_at_ot-builder_slash_bin-composite-types"; - packageName = "@ot-builder/bin-composite-types"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.6.1.tgz"; - sha512 = "xYJeoZ4vJMYv8UcWMOuuhCwsO061FHgsakr81XeKXVw2iJ5DknDvNv1Q7+ss34XlXl+Cj6vXe8i86tsa1AjU4g=="; - }; - }; - "@ot-builder/bin-util-1.6.1" = { - name = "_at_ot-builder_slash_bin-util"; - packageName = "@ot-builder/bin-util"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.6.1.tgz"; - sha512 = "k4CKNu3i+h17S1yzYi1ih1cXSCKyKWKDuQrCgV/6igMeZ8eAMnk1Y3+/eN4EXDODCa9LrYK/jZs643lfejMr9A=="; - }; - }; - "@ot-builder/cli-help-shower-1.6.1" = { - name = "_at_ot-builder_slash_cli-help-shower"; - packageName = "@ot-builder/cli-help-shower"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.6.1.tgz"; - sha512 = "J3aX1FtjGN7VMWA87xPwkIrXYtCNTT60fqE6izIU8X7mpRqgJlzVgg8ePQu3dLtUqo21oH8FUDLX5z1KjwInew=="; - }; - }; - "@ot-builder/cli-proc-1.6.1" = { - name = "_at_ot-builder_slash_cli-proc"; - packageName = "@ot-builder/cli-proc"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.6.1.tgz"; - sha512 = "zjXAbWIvW52/lLhMCw1STLHDiwtTV/2eF09+PGxn77PenBynw0f0+opxkL9wvrA83OEu3N2eEIK89JmRM+j89A=="; - }; - }; - "@ot-builder/cli-shared-1.6.1" = { - name = "_at_ot-builder_slash_cli-shared"; - packageName = "@ot-builder/cli-shared"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.6.1.tgz"; - sha512 = "RXbC9TqfcSVwo0gpqm8k+F3IrwzVHX67lxu0Fv2NCX/9HzgmzzusmD7tzLIYIs9fIdF2hOOhjT9JVPyFJkkS9A=="; - }; - }; - "@ot-builder/common-impl-1.6.1" = { - name = "_at_ot-builder_slash_common-impl"; - packageName = "@ot-builder/common-impl"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.6.1.tgz"; - sha512 = "Sg8PegFN/CoekaRQ1hGvQJLcUREF1ugRIwjbewLRPGTHGECSIsEipq4gyVsmHSUiUSlQRwycwAsaQMB8l9amww=="; - }; - }; - "@ot-builder/errors-1.6.1" = { - name = "_at_ot-builder_slash_errors"; - packageName = "@ot-builder/errors"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.6.1.tgz"; - sha512 = "04vPz6CI2O69Tfpby5K7dLZkRg21yQFSyAvvUJx22OU9SfDI4KTmtcwlYRwHAYBC9GFc4S+nx/+50pNZ5XJTqw=="; - }; - }; - "@ot-builder/io-bin-cff-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-cff"; - packageName = "@ot-builder/io-bin-cff"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.6.1.tgz"; - sha512 = "Ce/nnjzL/tF2VaUEk22jBk1wM28UoJttXl3mTPzuurSxfJTpXNPkib3KqoHN1/PdesNlhqiQr2FCdx9uOyjedg=="; - }; - }; - "@ot-builder/io-bin-encoding-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-encoding"; - packageName = "@ot-builder/io-bin-encoding"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.6.1.tgz"; - sha512 = "3t8Yvu0rJStgmUr4T8cSx+WMkusyfc5gL2a80UVsSzofo7RTK+MIr8bvL7b2z85pEP/DkKR/GFDGzzU1mwb0AQ=="; - }; - }; - "@ot-builder/io-bin-ext-private-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-ext-private"; - packageName = "@ot-builder/io-bin-ext-private"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.6.1.tgz"; - sha512 = "QrzerNSAN5TVreNeAtO6zZpMsR2Lsq8SNtAJeChSq2n2pxPwBJJnBnDr8K3If6ykucvVb1sLCqHyjEXG2D9ReA=="; - }; - }; - "@ot-builder/io-bin-font-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-font"; - packageName = "@ot-builder/io-bin-font"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.6.1.tgz"; - sha512 = "JXzKYXf8NR2DdUQ+BsdB9Eg5oM4HIYtFEr9aKHFTFY+E7MXRrkO+lPm43vOETB6+dWns9vJ4LIcyCO3MvBwQ5A=="; - }; - }; - "@ot-builder/io-bin-glyph-store-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-glyph-store"; - packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.6.1.tgz"; - sha512 = "yWnzgzgpBcyLaDevWmd48BRifNbIEl1EaEiUfuOFT8UHxwKBZharL7RyDkgOQH1v/JiS1F/bc7+dV83SU7qHtw=="; - }; - }; - "@ot-builder/io-bin-layout-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-layout"; - packageName = "@ot-builder/io-bin-layout"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.6.1.tgz"; - sha512 = "bdkBgGZ4d/ymmZxu3J5FOErn8MgdUBJDqETs8832U96sqb8aTB3vGtP0zIWB/ORuRXJNmBgPrZEa+Hi3ff51kw=="; - }; - }; - "@ot-builder/io-bin-metadata-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-metadata"; - packageName = "@ot-builder/io-bin-metadata"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.6.1.tgz"; - sha512 = "fKj2w5rXUNtOo69iY+4+I025ij+VSthpIWbp44dvQpwGHRDP2nAMZRDjdwpksKefKrHF0xUOZncoVk8cWUKnLQ=="; - }; - }; - "@ot-builder/io-bin-metric-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-metric"; - packageName = "@ot-builder/io-bin-metric"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.6.1.tgz"; - sha512 = "W9qUW3Ldw7cz/MPp0NFJ0UlbccTZ0jjjLJdAJgUjRmNemnLSJINy76gJKQPcLqQzWf0g+ZaqFIBpzo2kbJFXXQ=="; - }; - }; - "@ot-builder/io-bin-name-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-name"; - packageName = "@ot-builder/io-bin-name"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.6.1.tgz"; - sha512 = "5Ifb2iWM9CXwArQNT973YpWkClh7MxjjBJDaS2lt7WZl/CT2btBzHcZFubxxdplWloRMQQBsG+dM471BIs0gow=="; - }; - }; - "@ot-builder/io-bin-sfnt-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-sfnt"; - packageName = "@ot-builder/io-bin-sfnt"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.6.1.tgz"; - sha512 = "/dQ6XGGZMyB79kivB5ZNi2s6Q0sSPjGZNGn+Wv+S5Z1qSuoSZYE3HyQ6c2pPpmLDrats9KqxVXWFTJVEQsuYng=="; - }; - }; - "@ot-builder/io-bin-ttf-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-ttf"; - packageName = "@ot-builder/io-bin-ttf"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.6.1.tgz"; - sha512 = "K6Bf183nGPuDeGfDNTK0B2o0Ohe/HnV79tUdQxlNX0YWkehtinp5uK8BcwrBzl1oKr64HCU4/4MJzfYDzGZLPw=="; - }; - }; - "@ot-builder/io-bin-vtt-private-1.6.1" = { - name = "_at_ot-builder_slash_io-bin-vtt-private"; - packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.6.1.tgz"; - sha512 = "kQ7YzNU7Uji6wMF7zWptHrlU8/pGuFdhQSQAUxEh/20lMh3p6gKImI+EA91TOB4WPn9K1pNYIwc4Bbg2l/KoKw=="; - }; - }; - "@ot-builder/ot-1.6.1" = { - name = "_at_ot-builder_slash_ot"; - packageName = "@ot-builder/ot"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.6.1.tgz"; - sha512 = "QAsa5t+L2ud/Rfy7RGM47jJPVfsjhu1VSZhjqJlztjA2dYaWpesQPF5tacYuCz21UQHODdy3iumTAdugwZQYQw=="; - }; - }; - "@ot-builder/ot-encoding-1.6.1" = { - name = "_at_ot-builder_slash_ot-encoding"; - packageName = "@ot-builder/ot-encoding"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.6.1.tgz"; - sha512 = "1N544+6WkMCSp06WYyWe7TvF19NbiikTeJxH0LU1VSvBOaWI5syg3G7uSPzoLTezIkCV7nE5tj+tKOC6Lr45Ng=="; - }; - }; - "@ot-builder/ot-ext-private-1.6.1" = { - name = "_at_ot-builder_slash_ot-ext-private"; - packageName = "@ot-builder/ot-ext-private"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.6.1.tgz"; - sha512 = "6hvBv2AGOAwJ9xOP2pHq1VLSmSggotRsyFGTOGLHSzpufSdfiWmshKPE3uw472nSQ4M3Bd+mK/WuxH1jVvogZw=="; - }; - }; - "@ot-builder/ot-glyphs-1.6.1" = { - name = "_at_ot-builder_slash_ot-glyphs"; - packageName = "@ot-builder/ot-glyphs"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.6.1.tgz"; - sha512 = "O4r4fEcmioDGkO3QYeKH/IZFXToRZQkX4jqFQB4yq5qUiwjLJMKfi/giVnFK5jsu73NW+Ikq1mNNmxq4QpdtRQ=="; - }; - }; - "@ot-builder/ot-layout-1.6.1" = { - name = "_at_ot-builder_slash_ot-layout"; - packageName = "@ot-builder/ot-layout"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.6.1.tgz"; - sha512 = "4Bnmr8Gz60HgGCBD0cHFeXea8cbH454oDDzfozu2t3xmE2TJV6x/xIW9MXyl+W88BOUlAOu9+hxOPkfxPvoASg=="; - }; - }; - "@ot-builder/ot-metadata-1.6.1" = { - name = "_at_ot-builder_slash_ot-metadata"; - packageName = "@ot-builder/ot-metadata"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.6.1.tgz"; - sha512 = "ZXx0wx/cO/mivhGH5UbvfFe2QsTT74fw1N9NUCjmyupLz8og6kX//Lhj33/sjQqc9p+kBcjp9qVzL99D5tbx8A=="; - }; - }; - "@ot-builder/ot-name-1.6.1" = { - name = "_at_ot-builder_slash_ot-name"; - packageName = "@ot-builder/ot-name"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.6.1.tgz"; - sha512 = "CdCmblvnr/M3PrQT4W0/12df5LhSQxM+eZbE64NLY7ZKekJK7C8MpSuo0lBTAduAQAczAmN3+HfQ2v1xXtBNOg=="; - }; - }; - "@ot-builder/ot-sfnt-1.6.1" = { - name = "_at_ot-builder_slash_ot-sfnt"; - packageName = "@ot-builder/ot-sfnt"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.6.1.tgz"; - sha512 = "jKc2TnfTvQu/958TJrZwG9MxwTRbmcRc9ZvW1MjEK9FK7OqfjxiNAUXJLZm9x2ETxW5pMnkcrkCSD2QaLpuV7w=="; - }; - }; - "@ot-builder/ot-standard-glyph-namer-1.6.1" = { - name = "_at_ot-builder_slash_ot-standard-glyph-namer"; - packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.6.1.tgz"; - sha512 = "qU5+2fzE0iana0BJQOuclGwDCA5BboJIc6e651+6SKfdg/lY+KhmdJR5IvjKSARz3c4Uk9r1bbtOjuiFAlnePQ=="; - }; - }; - "@ot-builder/ot-vtt-private-1.6.1" = { - name = "_at_ot-builder_slash_ot-vtt-private"; - packageName = "@ot-builder/ot-vtt-private"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.6.1.tgz"; - sha512 = "tBCs7mK3+Potn4DLEOABd1xRZLhG9X7AOASeAJwPOGBNi831DyYuODLeFIE9BKZThoP5GlbTpn5zt2w51Spy8g=="; - }; - }; - "@ot-builder/prelude-1.6.1" = { - name = "_at_ot-builder_slash_prelude"; - packageName = "@ot-builder/prelude"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.6.1.tgz"; - sha512 = "EeO5vzAEpoRHrA9U39mANa5eoFk/LdS7zhSDiqe4wuDjw9MMcTlkPT1O9aKNNBWdC/ErMutM+AR5b7YWzgSFZw=="; - }; - }; - "@ot-builder/primitive-1.6.1" = { - name = "_at_ot-builder_slash_primitive"; - packageName = "@ot-builder/primitive"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.6.1.tgz"; - sha512 = "1NJpEeaRxrLdjA5nIr92U4DL7bfTMHJgJRIlBu2tGHYttnCOmBWqyRVA+g+prwwUR06EH8I7Dv3q042uc5Ji0A=="; - }; - }; - "@ot-builder/rectify-1.6.1" = { - name = "_at_ot-builder_slash_rectify"; - packageName = "@ot-builder/rectify"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.6.1.tgz"; - sha512 = "JFSO1YbH9G0pBqBk5xT01YvurUXiHH7k6daP4ceWfKp0Ch6cZCtgvxHIDvtSNxhYnlhBkBWye2+UyZSBlIu77w=="; - }; - }; - "@ot-builder/stat-glyphs-1.6.1" = { - name = "_at_ot-builder_slash_stat-glyphs"; - packageName = "@ot-builder/stat-glyphs"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.6.1.tgz"; - sha512 = "IGZkR9QdVjPAEBXAe4qixlp4DvHioxD/bp/d+jlIUVgUGZzo/wpwUV/ktT/zjZXDdNpVSdTa/RSG5mUtWHqf8w=="; - }; - }; - "@ot-builder/trace-1.6.1" = { - name = "_at_ot-builder_slash_trace"; - packageName = "@ot-builder/trace"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.6.1.tgz"; - sha512 = "r18ahZoSFv2bWl9oQCDM4IT4aPr8krMjHJHj0brHoMKhrPH/iE9k+d97UaqXUd+I8ZliTfihK/AzOArjIv2ZqQ=="; - }; - }; - "@ot-builder/var-store-1.6.1" = { - name = "_at_ot-builder_slash_var-store"; - packageName = "@ot-builder/var-store"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.6.1.tgz"; - sha512 = "SHkiufkRd07hE4Y75lr013yN0TKdebCqe9VpY/W05EwFL+0DBX2w1cE8FYqiVeS2EYA2hE727BpxTJbTHcRa2Q=="; - }; - }; - "@ot-builder/variance-1.6.1" = { - name = "_at_ot-builder_slash_variance"; - packageName = "@ot-builder/variance"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.6.1.tgz"; - sha512 = "RQ9H+jCcshoEUOYjpaOhxSJ31uiKJ8FAOqAvd8JdmDNJAHmmQmaNINOUr+amR0bJk6GqbKnuK48Xs3+8OiAgcw=="; - }; - }; "@parcel/bundler-default-2.8.3" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; @@ -10516,13 +10021,13 @@ let sha512 = "a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg=="; }; }; - "@redis/client-1.5.3" = { + "@redis/client-1.5.5" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.5.3"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.3.tgz"; - sha512 = "kPad3QmWyRcmFj1gnb+SkzjXBV7oPpyTJmasVA+ocgNClxqZaTJjLFReqxm9cZQiCtqZK9vrcTISNrgzQXFpLg=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.5.tgz"; + sha512 = "fuMnpDYSjT5JXR9rrCW1YWA4L8N/9/uS4ImT3ZEC/hcaQRI1D/9FvwjriRj1UvepIgzZXthFVKMNRzP/LNL7BQ=="; }; }; "@redis/graph-1.0.1" = { @@ -10606,13 +10111,13 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.122" = { + "@redocly/openapi-core-1.0.0-beta.123" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.122"; + version = "1.0.0-beta.123"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.122.tgz"; - sha512 = "oky8yeq0Bodw+lj+jxPP4PZPdsN+Fx71N0X5PPEGzMe8zBhFnOAXMR7auA02gHz7DhOnCZ7kTNV1KcftRtSRNg=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.123.tgz"; + sha512 = "W6MbUWpb/VaV+Kf0c3jmMIJw3WwwF7iK5nAfcOS+ZwrlbxtIl37+1hEydFlJ209vCR9HL12PaMwdh2Vpihj6Jw=="; }; }; "@repeaterjs/repeater-3.0.4" = { @@ -10624,121 +10129,121 @@ let sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; }; }; - "@resvg/resvg-js-2.2.0" = { + "@resvg/resvg-js-2.3.1" = { name = "_at_resvg_slash_resvg-js"; packageName = "@resvg/resvg-js"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.2.0.tgz"; - sha512 = "Btc6Bht2Y8jBlS1RqVYsPWQaL1WgeGZd/TasmQpCsh0s5Ax1Kw0zyr6DCpvlNYG6b3mNnmJ5ib44A5MIQZmrEQ=="; + url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.3.1.tgz"; + sha512 = "khkCB99ZKPXo6XQHHbOu7sLlayryP088chsO+ocp/LbEVm7cFOcsw5Dn9o/DMc4E9rT0jkEOVaVrH+GXkllnSg=="; }; }; - "@resvg/resvg-js-android-arm-eabi-2.2.0" = { + "@resvg/resvg-js-android-arm-eabi-2.3.1" = { name = "_at_resvg_slash_resvg-js-android-arm-eabi"; packageName = "@resvg/resvg-js-android-arm-eabi"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.2.0.tgz"; - sha512 = "w3lAI6R5cfxGM5oxX6XhEFob4mJkkyfKm0veUQJOg65J4dznwcaJ54lGuQPfjAPhcHxSk/w+7BvFLjbbjV09qw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.3.1.tgz"; + sha512 = "N9TEhMW3DC4t5rRhMO31AZY3IBHrPPaYlfhm9g5A+4jHheNeFkWj3WHwTOThFMTDln45t7R7dZ4yVpI81Ucbkw=="; }; }; - "@resvg/resvg-js-android-arm64-2.2.0" = { + "@resvg/resvg-js-android-arm64-2.3.1" = { name = "_at_resvg_slash_resvg-js-android-arm64"; packageName = "@resvg/resvg-js-android-arm64"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.2.0.tgz"; - sha512 = "rzo0IqUErz1GzPthmU3wB25Vvdyr6KGI+J2WqALgSqmFxJ/sDygT2/6tirb4Lp1IjbvLhzO3uA6SP/sMwcWNfw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.3.1.tgz"; + sha512 = "NFET2XoeWzskTJPaOcse2/iHizct9c5YhZ2gDjEeh3n1wyhpuQemdWH1qoodjxfeiBNqlIMi+fOoEv43tw+j2Q=="; }; }; - "@resvg/resvg-js-darwin-arm64-2.2.0" = { + "@resvg/resvg-js-darwin-arm64-2.3.1" = { name = "_at_resvg_slash_resvg-js-darwin-arm64"; packageName = "@resvg/resvg-js-darwin-arm64"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.2.0.tgz"; - sha512 = "MHJBjUh+xlZeMXcHqGiBO5d5CcgNAd0pXXaOmQtcamfBN5oc9SCJP3z137BEN5RhE6bgz6Wl88Sv1Jh3Wn0nlA=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.3.1.tgz"; + sha512 = "yZHN6lzvQochS8Qs7JI/xfasStog2EV8KOg4Xd75JhoB2w6ORZ/GlL3T/zA+f9vEkXL9rPymK/IOTSdNFNjbLQ=="; }; }; - "@resvg/resvg-js-darwin-x64-2.2.0" = { + "@resvg/resvg-js-darwin-x64-2.3.1" = { name = "_at_resvg_slash_resvg-js-darwin-x64"; packageName = "@resvg/resvg-js-darwin-x64"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.2.0.tgz"; - sha512 = "y6uaW/lWgvqpoeTA2hrgPlvNS7kbduBpUfYCpmk7KzOEMBzUUssOHT+DgqlQ7SZOi01mL6DHeDpAjvzM7K4Ocw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.3.1.tgz"; + sha512 = "EGeyTuPZG/JP92PROXQ1CmEnq/C0yOTrbX76XX+BHicjfhAjGx3sii1qD9k608TW0MppPMAVcQbhT1hxaQ4ViA=="; }; }; - "@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" = { + "@resvg/resvg-js-linux-arm-gnueabihf-2.3.1" = { name = "_at_resvg_slash_resvg-js-linux-arm-gnueabihf"; packageName = "@resvg/resvg-js-linux-arm-gnueabihf"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.2.0.tgz"; - sha512 = "G32NqLnuYilT3z5oD5AKXZvpD/ZPRzP1t2T0dvqQC6kBE6c5ckhdCbyT0gnnarcvMoXP+J/xh7kadEp3V8wFDg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.3.1.tgz"; + sha512 = "EhlgOj1mxHbYATQch66G5yzCgrT6MvtH6wZua1bxjTK/QrPf3B0kkY6vmHlYOtZ9y807swXk3GlNhT9ztL21aw=="; }; }; - "@resvg/resvg-js-linux-arm64-gnu-2.2.0" = { + "@resvg/resvg-js-linux-arm64-gnu-2.3.1" = { name = "_at_resvg_slash_resvg-js-linux-arm64-gnu"; packageName = "@resvg/resvg-js-linux-arm64-gnu"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.2.0.tgz"; - sha512 = "R0KJCCyjFcTDFT+nAVlP/CYUMIEjxSkSJsEED9QesulCxMY/aoO52p91FgQrGjecORkASNXovlqS3HsNYbCTOg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.3.1.tgz"; + sha512 = "wcamGmsNTVkq7Je0iMwDI+Te+ZD8YLYJpRBmQK5pnRWWzEp6ft6kHJ/dU8FjCipn0I8zUUNWylMsMVz5d0k5XQ=="; }; }; - "@resvg/resvg-js-linux-arm64-musl-2.2.0" = { + "@resvg/resvg-js-linux-arm64-musl-2.3.1" = { name = "_at_resvg_slash_resvg-js-linux-arm64-musl"; packageName = "@resvg/resvg-js-linux-arm64-musl"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.2.0.tgz"; - sha512 = "Ir83lcBsuB6YVkAVPW4AAOzYo/F9kjlx2HA/O3vCjy/Rn5u5Xf2fGANfJxfCHUCtDMcqmM4hjdF2fOzqS9fusw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.3.1.tgz"; + sha512 = "ebvSKvTopIvZ3Wl3B4Wh7OqIVnRyJu29hSyaO1I+/cWJGSvk6GfFjGB6WYAsr9wjZPmDy8i3ODFKSrFRMgOaXQ=="; }; }; - "@resvg/resvg-js-linux-x64-gnu-2.2.0" = { + "@resvg/resvg-js-linux-x64-gnu-2.3.1" = { name = "_at_resvg_slash_resvg-js-linux-x64-gnu"; packageName = "@resvg/resvg-js-linux-x64-gnu"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.2.0.tgz"; - sha512 = "pH1GdShtIDF3fmQZM9NTEEdZPkNKQ+XUJb7r1jaD8gusdXeD2ejWWi/uvlsugaoMoG0tUmMZi78eVm4IjlY+gw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.3.1.tgz"; + sha512 = "DG2JRHRQPELa/PhZwv2cfOil4EUB0aBLh4SmbuMUke1eAfcFxizyJGsR6E98aG1ZX1gYlpb5hHJou+xvpTl2Jw=="; }; }; - "@resvg/resvg-js-linux-x64-musl-2.2.0" = { + "@resvg/resvg-js-linux-x64-musl-2.3.1" = { name = "_at_resvg_slash_resvg-js-linux-x64-musl"; packageName = "@resvg/resvg-js-linux-x64-musl"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.2.0.tgz"; - sha512 = "7n2d4gfcyLb06RE/7aMGwiiMiqeCf/Ze/fBhKs9F2L60GX6rpgDC2PGJmWBiXIwz48PifvxmBiqD9XCUH5YGoA=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.3.1.tgz"; + sha512 = "Qe9qyBk3waRppnIckiCj8Ql0tLY9qQACqcCUooQEbGaFY4iz4DcVyH/bFnNp2k9qGAA+AS1apimU84987L411Q=="; }; }; - "@resvg/resvg-js-win32-arm64-msvc-2.2.0" = { + "@resvg/resvg-js-win32-arm64-msvc-2.3.1" = { name = "_at_resvg_slash_resvg-js-win32-arm64-msvc"; packageName = "@resvg/resvg-js-win32-arm64-msvc"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.2.0.tgz"; - sha512 = "rJWhnui1+P9lakfx92zhm+HInZUU1NdvkL/G5KrFcRI8HH0rfdNHokfKknvuko4e7iUSia7kTsbuKDNe4fErtQ=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.3.1.tgz"; + sha512 = "W5JgJELQuKLeAjXJI38B3MMnIm+X5hR+mFWWM7PoQZrKD7p59grORj+FNPknF33eaglIiUoMh3zZJMxWVitBgw=="; }; }; - "@resvg/resvg-js-win32-ia32-msvc-2.2.0" = { + "@resvg/resvg-js-win32-ia32-msvc-2.3.1" = { name = "_at_resvg_slash_resvg-js-win32-ia32-msvc"; packageName = "@resvg/resvg-js-win32-ia32-msvc"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.2.0.tgz"; - sha512 = "GlckTgsrlF9PQlWcXs1EySeGaT8TAkrSGhVZPRvSv46DUpZlhyVVvKMjsvpbDfqWltFkJTEgkTJ6uravnJrEMA=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.3.1.tgz"; + sha512 = "/Ied/0EfsLwYhYY9dBOcMUFDo5TM9ddWapBLoV9bDqlpiE3+J1slpaBAzltN3x7SH8jhlZG9N3YoNVh0RhsUPA=="; }; }; - "@resvg/resvg-js-win32-x64-msvc-2.2.0" = { + "@resvg/resvg-js-win32-x64-msvc-2.3.1" = { name = "_at_resvg_slash_resvg-js-win32-x64-msvc"; packageName = "@resvg/resvg-js-win32-x64-msvc"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.2.0.tgz"; - sha512 = "4coA6J+MfrpbMaPynSLmmiq3DutmvNmCcNFyjnhhnytQW7+8zbrkVZGra7fty3364LY3unZGxS878WRa/AU7tw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.3.1.tgz"; + sha512 = "aj8n5G9QwRnNfeZYSn9TxPO9LMUmleKoRgY1qxMbQg1v2SaspOFVeR7FJBXFWW8nejUKQqnkY+1+6qMMydxFsA=="; }; }; "@rollup/plugin-commonjs-22.0.2" = { @@ -10804,31 +10309,31 @@ let sha512 = "nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.90.0" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.89.1"; + version = "5.90.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.89.1.tgz"; - sha512 = "TyvsweC16xNoZeFEbv4vCD4z2L6jO6GXmw+97y1ep+OVJXQzKJHPgV4Wct2i+jYjO1+cbUsqshUwyJif42UqvA=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.90.0.tgz"; + sha512 = "Yz8ujdluTVzv9snmU/16E7wKleOdrTxcPQ62bit8ju6siaseXwKkBQeRyk9/0xeNIjI4kP2LUw8LSwvFZa1tcw=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.90.0" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.89.1"; + version = "5.90.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.89.1.tgz"; - sha512 = "YpF+18c/Z5YYCH9WRQ/X6lxhpxcxO8727XNWrOMBbYCIjQgPY83Dh3xGtDk8sLr2WFxJVKIetyEtHDJNh5ghGg=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.90.0.tgz"; + sha512 = "C4KY9HYCO1CODAfGfgl5zO+Otj3nnNiv1NKUtugC0jsWTt7j1PTKKrI9KQcqBnO8FUCK2fKDD/JcNNYBGqjzzQ=="; }; }; - "@rushstack/rush-sdk-5.89.1" = { + "@rushstack/rush-sdk-5.90.0" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.89.1"; + version = "5.90.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.89.1.tgz"; - sha512 = "KSrcfycU82dI3+XIVIwiESnIXsMyvzkDHgfDexl1K+094klzYlmQBvDc8ladaUmTWs/9eRadggN/Y2xhgE7wOg=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.90.0.tgz"; + sha512 = "8GTwlCwnz036dPqbV7elEZ0IqIS6yVKREB98C1yt7bRy4r56SN12s6hA8j45tG4sRqBD/PzUJtEwZns2md1rJg=="; }; }; "@rushstack/stream-collator-4.0.222" = { @@ -10894,13 +10399,13 @@ let sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; }; }; - "@schematics/angular-15.1.3" = { + "@schematics/angular-15.1.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "15.1.3"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.3.tgz"; - sha512 = "jCJ0Nq/FpoMnA63rPAhRWQJFVbS+K8NpdTHZ/7l4wx9iFtIH7khCdbp3QYMJSwZh5pEiw/NO7ouxsWo5YgapYQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.4.tgz"; + sha512 = "4SV8dDGZeSvts01b8y2W6FmpDD0dQhBlGMhMJKC/tUnhfNKfYCs2VKtMBsIc3ZiGP2yoA3+nUiMmtS6hEkXYHw=="; }; }; "@segment/ajv-human-errors-2.2.0" = { @@ -10939,13 +10444,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.34.0" = { + "@sentry/core-7.36.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz"; - sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.36.0.tgz"; + sha512 = "lq1MlcMhvm7QIwUOknFeufkg4M6QREY3s61y6pm1o+o3vSqB7Hz0D19xlyEpP62qMn8OyuttVKOVK1UfGc2EyQ=="; }; }; "@sentry/hub-6.19.7" = { @@ -10957,13 +10462,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.34.0" = { + "@sentry/integrations-7.36.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz"; - sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.36.0.tgz"; + sha512 = "wrRoUqdeGi64NNimGVk8U8DBiXamxTYPBux0/faFDyau8EJyQFcv8zOyB78Za4W2Ss3ZXNaE/WtFF8UxalHzBQ=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10984,13 +10489,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.34.0" = { + "@sentry/node-7.36.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz"; - sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.36.0.tgz"; + sha512 = "nAHAY+Rbn5OlTpNX/i6wYrmw3hT/BtwPZ/vNU52cKgw7CpeE1UrCeFjnPn18rQPB7lIh7x0vNvoaPrfemRzpSQ=="; }; }; "@sentry/types-6.19.7" = { @@ -11002,13 +10507,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.34.0" = { + "@sentry/types-7.36.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz"; - sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.36.0.tgz"; + sha512 = "uvfwUn3okAWSZ948D/xqBrkc3Sn6TeHUgi3+p/dTTNGAXXskzavgfgQ4rSW7f3YD4LL+boZojpoIARVLodMGuA=="; }; }; "@sentry/utils-6.19.7" = { @@ -11020,13 +10525,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.34.0" = { + "@sentry/utils-7.36.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz"; - sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.36.0.tgz"; + sha512 = "mgDi5X5Bm0sydCzXpnyKD/sD98yc2qnKXyRdNX4HRRwruhC/P53LT0hGhZXsyqsB/l8OAMl0zWXJLg0xONQsEw=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -11542,22 +11047,22 @@ let sha512 = "z46fnrvraaWMio8Y9RYYkLO+XdmtxOWpy5qNJF3CsmWua0FZ4iOTryb5Cm3GkB0wEtqxNUCBUHvoo4hS6Noyqg=="; }; }; - "@stoplight/spectral-core-1.16.0" = { + "@stoplight/spectral-core-1.16.1" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.16.0.tgz"; - sha512 = "W/NG+wV2UffwLExboqEa04/JbjGhiSTOl7GghLWYP4NKxZGaO6karP6fIxRBOnm34n1qyoZv9thsjSe92MWcDw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.16.1.tgz"; + sha512 = "zPTM/OpjUySMRLPx6ZYy9Gtw+Rkuwg1/gQTKWta+AaJjVTHrNznYQ05gFLYjWwD/LGJMdjwE2IMi7T+Ntef+kw=="; }; }; - "@stoplight/spectral-formats-1.4.0" = { + "@stoplight/spectral-formats-1.5.0" = { name = "_at_stoplight_slash_spectral-formats"; packageName = "@stoplight/spectral-formats"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.4.0.tgz"; - sha512 = "j9VQukDzgqDSi26rK9LqsbXrqtkeIsPSPgEf5/sxRsmeF2bwWUhSjYXgYin4flSZ7owFZjZWQ3o0Qq3iApi2JQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.5.0.tgz"; + sha512 = "VskkdU3qBSvI1dfJ79ysjvTssfNlbA6wrf/XkXK6iTyjfIVqOAWVtjypTb2U95tN/X8IjIBBhNWtZ4tNVZilrA=="; }; }; "@stoplight/spectral-functions-1.7.2" = { @@ -11605,13 +11110,13 @@ let sha512 = "TiH7UZIuHX+yb6EsWA9Z2ou455Wtki3z7SCkVRgd7WdzkD7O13R8ywqKoCUJ44UP7iuo1Ejnog18Rw4qJJE/fg=="; }; }; - "@stoplight/spectral-rulesets-1.14.1" = { + "@stoplight/spectral-rulesets-1.15.0" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; - version = "1.14.1"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.14.1.tgz"; - sha512 = "tn6a5fYPFDwEY+/YyK/hcq2gcR5nSIBt7l+JGELb/2RdTzD5ikj2mfl2ua3uxbqOZytftFoOX5ewGZ0qQNrudw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.15.0.tgz"; + sha512 = "xgltt54aQPSKKAxPZ2oCA25X/xmDPVCV1e4qxqH5bw/t7LvDWVusBFUrtcl/5HAJIIgkpxOKXKEc2XRC0ea8HQ=="; }; }; "@stoplight/spectral-runtime-1.1.2" = { @@ -11641,13 +11146,13 @@ let sha512 = "dzyuzvUjv3m1wmhPfq82lCVYGcXG0xUYgqnWfCq3PCVR4BKFhjdkHrnJ+jIDoMKvXb05AZP/ObQF6+NpDo29IQ=="; }; }; - "@stoplight/types-13.8.0" = { + "@stoplight/types-13.9.0" = { name = "_at_stoplight_slash_types"; packageName = "@stoplight/types"; - version = "13.8.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/types/-/types-13.8.0.tgz"; - sha512 = "5glKswz7y9aACh+a+JegID+4xX//4TsIdv7iPl29hWnOoWrnlPbg3Gjc4nYUXXgMSaSlSsA15JU/0+rE89fR4A=="; + url = "https://registry.npmjs.org/@stoplight/types/-/types-13.9.0.tgz"; + sha512 = "o3sg/5aYpnT8jZITjXqBz6MGwuW/RQxjXlcU57bKorCustgBH+TvcI9QFNJSeg4fomAwQo6rk+xmhf93Xf8OzQ=="; }; }; "@stoplight/yaml-4.2.3" = { @@ -11731,202 +11236,103 @@ let sha512 = "LOC/z9HDUmTqSAF08YIRLThGGNZLdRrjcEdoQu/EANxPSVRedYgh4AiZlOX8sY8Rp1p7S/StOmZogJLuvR4mcA=="; }; }; - "@swc/core-1.3.29" = { + "@swc/core-1.3.32" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz"; - sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.32.tgz"; + sha512 = "Yx/n1j+uUkcqlJAW8IRg8Qymgkdow6NHJZPFShiR0YiaYq2sXY+JHmvh16O6GkL91Y+gTlDUS7uVgDz50czJUQ=="; }; }; - "@swc/core-1.3.30" = { - name = "_at_swc_slash_core"; - packageName = "@swc/core"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.30.tgz"; - sha512 = "pg6GWw615EwCh4vJ5k7xll1E4WJSPeINrRvF/EPyBvNNhlXR3s6+KZevJTx3PpA5PXjprDR0aqwi0/aigSCAPA=="; - }; - }; - "@swc/core-darwin-arm64-1.3.29" = { + "@swc/core-darwin-arm64-1.3.32" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.29.tgz"; - sha512 = "1RQ0MCmWOQmo3qG60vhbNaO/qMZ25lDfjhTayAzHjS1k7WyoUv3M8Em2Fip2VKJz5cN2M7MWiP5aHMotMovuaQ=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.32.tgz"; + sha512 = "o19bhlxuUgjUElm6i+QhXgZ0vD6BebiB/gQpK3en5aAwhOvinwr4sah3GqFXsQzz/prKVDuMkj9SW6F/Ug5hgg=="; }; }; - "@swc/core-darwin-arm64-1.3.30" = { - name = "_at_swc_slash_core-darwin-arm64"; - packageName = "@swc/core-darwin-arm64"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.30.tgz"; - sha512 = "GZ4mZZbH77N8renK34A3Lkhl6x8z+c97SCbl43pn5E0Z0sifohA8WNhrtucKrUdid0svYibwotJzeFNpDtg7gQ=="; - }; - }; - "@swc/core-darwin-x64-1.3.29" = { + "@swc/core-darwin-x64-1.3.32" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.29.tgz"; - sha512 = "UXiVOkt9i/mwarhHiN6o5RAi3Q7riCQTiOO2e98c/qi3SiYqbgd6kil+2gBcpVB0CGEFyyGB9rECwNBkaYe7zw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.32.tgz"; + sha512 = "hVEGd+v5Afh+YekGADOGKwhuS4/AXk91nLuk7pmhWkk8ceQ1cfmah90kXjIXUlCe2G172MLRfHNWlZxr29E/Og=="; }; }; - "@swc/core-darwin-x64-1.3.30" = { - name = "_at_swc_slash_core-darwin-x64"; - packageName = "@swc/core-darwin-x64"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.30.tgz"; - sha512 = "ppGrAJmKpT3vFr2vGaxXFL8JqHsb6kSAj0dVYTNYicl3c6XOjnMiNSfu6HRbdmXt0VpFHhC5L/a7Ta89mQ1sJA=="; - }; - }; - "@swc/core-linux-arm-gnueabihf-1.3.29" = { + "@swc/core-linux-arm-gnueabihf-1.3.32" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.29.tgz"; - sha512 = "0B7+FoYgEE1Yg6j5EAtEpKVbHby3jnJo6Y4g0dGxecRtXUhu8TKVI4P93sj4PJ+l4XkAyzdhSsQ+ytFRsbOJ6w=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.32.tgz"; + sha512 = "5X01WqI9EbJ69oHAOGlI08YqvEIXMfT/mCJ1UWDQBb21xWRE2W1yFAAeuqOLtiagLrXjPv/UKQ0S2gyWQR5AXQ=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.30" = { - name = "_at_swc_slash_core-linux-arm-gnueabihf"; - packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.30.tgz"; - sha512 = "XQYY/VNRnM0/779ehfMgh2poO3reOANvfzOprF8xmGK20+DxFqbMWjHhJutscQuEjLtdwk/LfgCkwmTaB1hhwg=="; - }; - }; - "@swc/core-linux-arm64-gnu-1.3.29" = { + "@swc/core-linux-arm64-gnu-1.3.32" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.29.tgz"; - sha512 = "XN9axiTuiFOm+UBnDDOQV3b2OekziXHtVPBAPSEssRsNGS4uN7YvCyVAcS8GYdK7GoZ+cmoZBYwD4trir48WXw=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.32.tgz"; + sha512 = "PTJ6oPiutkNBg+m22bUUPa4tNuMmsgpSnsnv2wnWVOgK0lhvQT6bAPTUXDq/8peVAgR/SlpP2Ht8TRRqYMRjRQ=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.30" = { - name = "_at_swc_slash_core-linux-arm64-gnu"; - packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.30.tgz"; - sha512 = "ME4BjMYSXana0Lfswa3aQW0rTdmR9wa1NGQ3t6MYLdBVm+76Xwe29JKlOfnI1iCCtcbRBoWy4dlhyuxW8DN7cw=="; - }; - }; - "@swc/core-linux-arm64-musl-1.3.29" = { + "@swc/core-linux-arm64-musl-1.3.32" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.29.tgz"; - sha512 = "M6eE02Dzl1efRLozitGvgjiNEee0VQInqMX4tvfpzQwqZsKNAD8/NGPeTG4763BLDHc4hnMZbnt5wncDLjFq7A=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.32.tgz"; + sha512 = "lG0VOuYNPWOCJ99Aza69cTljjeft/wuRQeYFF8d+1xCQS/OT7gnbgi7BOz39uSHIPTBqfzdIsuvzdKlp9QydrQ=="; }; }; - "@swc/core-linux-arm64-musl-1.3.30" = { - name = "_at_swc_slash_core-linux-arm64-musl"; - packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.30.tgz"; - sha512 = "h3X9Pn1m5kuFSW8lJyDiMB4ELNZFJ+QxLva5GCxZDArQttkNeY4tMNWFcaG44xUXeywffrgjpXO7Yj2JGzmG4g=="; - }; - }; - "@swc/core-linux-x64-gnu-1.3.29" = { + "@swc/core-linux-x64-gnu-1.3.32" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.29.tgz"; - sha512 = "t2e9byHRpxKyUsLeODlb3yKJcm8wMirsLIxjr24q5YbnChD3QUMQwA8aA9w2PWc86ihukw7Ksx3RYT7uR706HA=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.32.tgz"; + sha512 = "ecqtSWX4NBrs7Ji2VX3fDWeqUfrbLlYqBuufAziCM27xMxwlAVgmyGQk4FYgoQ3SAUAu3XFH87+3Q7uWm2X7xg=="; }; }; - "@swc/core-linux-x64-gnu-1.3.30" = { - name = "_at_swc_slash_core-linux-x64-gnu"; - packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.30.tgz"; - sha512 = "vfPR8cakx5IZQSpNuXPrpkRprBdVxXsvN5JWN3fpuNVIgFFo3q8njihaItujKvePIHQwov4achfBZlm4JRitWQ=="; - }; - }; - "@swc/core-linux-x64-musl-1.3.29" = { + "@swc/core-linux-x64-musl-1.3.32" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.29.tgz"; - sha512 = "3jDzDYIyHXrXKOSnTtsN56eINbTPuVQj65D3K8+zo1o52GGwNGyCvQt2RpxNfM8+ptb4j6v7weSU8kVvbUzGTQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.32.tgz"; + sha512 = "rl3dMcUuENVkpk5NGW/LXovjK0+JFm4GWPjy4NM3Q5cPvhBpGwSeLZlR+zAw9K0fdGoIXiayRTTfENrQwwsH+g=="; }; }; - "@swc/core-linux-x64-musl-1.3.30" = { - name = "_at_swc_slash_core-linux-x64-musl"; - packageName = "@swc/core-linux-x64-musl"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.30.tgz"; - sha512 = "jtfv8N+00E2RMTVjwfTfimeqzo0B9FmbbSkzlnLvkmV8xDAPyLmX7v/xL5YiVJRLeSrlJ7DmkCSxLzpJao73dw=="; - }; - }; - "@swc/core-win32-arm64-msvc-1.3.29" = { + "@swc/core-win32-arm64-msvc-1.3.32" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.29.tgz"; - sha512 = "3PadPieyslG++7SQ42OApfiXtQdzFpnCv/i/UJ6gOL5d0MluNzZ2nIxD8LwXXizVdmcm8bmc0WRhK3JhvhzVJA=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.32.tgz"; + sha512 = "VlybAZp8DcS66CH1LDnfp9zdwbPlnGXREtHDMHaBfK9+80AWVTg+zn0tCYz+HfcrRONqxbudwOUIPj+dwl/8jw=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.30" = { - name = "_at_swc_slash_core-win32-arm64-msvc"; - packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.30.tgz"; - sha512 = "fX3T6JzS5F8JJ/UZQWrZfdml8nLuSzgA0EFKetTNa5AHh1x9ltShmlFOJ3OPpD9BKI/QcQSLxyoAjxt7NtAnaQ=="; - }; - }; - "@swc/core-win32-ia32-msvc-1.3.29" = { + "@swc/core-win32-ia32-msvc-1.3.32" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.29.tgz"; - sha512 = "tUFrHxxYz9Cfz07yGwDXdtRziC3q1ia2SHodzZ3obTpY+HQiBDHs0QO/HkbUBNF+du0vhnsgtWilnsMQDILFDQ=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.32.tgz"; + sha512 = "MEUMdpUFIQ+RD+K/iHhHKfu0TFNj9VXwIxT5hmPeqyboKo095CoFEFBJ0sHG04IGlnu8T9i+uE2Pi18qUEbFug=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.30" = { - name = "_at_swc_slash_core-win32-ia32-msvc"; - packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.30.tgz"; - sha512 = "m88NjTcVFHFAciWRWTW7NbeQPrzjKKBzSoSPukhjvKSWQNk5v6BBbTAKpymNGQssPn5WLarC2QlQzCwjyh1QLA=="; - }; - }; - "@swc/core-win32-x64-msvc-1.3.29" = { + "@swc/core-win32-x64-msvc-1.3.32" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.29.tgz"; - sha512 = "/Z3kxMXGKlIhtkxBxsCSZl8j/qYfbA4dtW7RKv1RNxbPLbwk8k3Owhgk/Y3JeRavcUKwja1rUX5rhMjLYeN3tw=="; - }; - }; - "@swc/core-win32-x64-msvc-1.3.30" = { - name = "_at_swc_slash_core-win32-x64-msvc"; - packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.30.tgz"; - sha512 = "HsePRjbdD5XsnS8NkN+MmhtUyjF16cU3COd92DjRYKsB1rMDE51itfacBvOeZPHFV6VkrLsakubAZCMc+3d/Ag=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.32.tgz"; + sha512 = "DPMoneNFQco7SqmVVOUv1Vn53YmoImEfrAPMY9KrqQzgfzqNTuL2JvfxUqfAxwQ6pEKYAdyKJvZ483rIhgG9XQ=="; }; }; "@swc/helpers-0.4.14" = { @@ -11938,22 +11344,13 @@ let sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.29" = { + "@swc/wasm-1.3.32" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.29"; + version = "1.3.32"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz"; - sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw=="; - }; - }; - "@swc/wasm-1.3.30" = { - name = "_at_swc_slash_wasm"; - packageName = "@swc/wasm"; - version = "1.3.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.30.tgz"; - sha512 = "y5LnHLIaZ2mNmnY/b0jEJccV3eErxnIbF8K3RxqmnD4zWHsuvaOAVeQPKTK4vlM/V9ip+BUtCeFiUfnxCx8JwA=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.32.tgz"; + sha512 = "u27gmXtbe/y4M5fo38NCBKUFeFIWRCmppABxPvM9TsZ8KhO4EdZOI1L9sPHSZvVyAXRpnwC8cjYej/zOAZjAQA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -12010,13 +11407,13 @@ let sha512 = "uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA=="; }; }; - "@textlint/ast-node-types-13.0.4" = { + "@textlint/ast-node-types-13.1.4" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.0.4.tgz"; - sha512 = "6/8reOpc7csrwR8Hd+WqP75QS2akk8U7lzCAUv5cyoGga2KzWlauCC6gy4ZU/Qw8UfSU2ri7ZcX975i6KYLtwQ=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.1.4.tgz"; + sha512 = "6MQvKz+rlMi/3DjLGywBlRSoJGJowMJbtc3IUTjAg9lVbfqPYkkYp3XvaC5C1m8OeBcca55g+d3CzZOUGhR6DA=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -12037,13 +11434,13 @@ let sha512 = "Gxiq6xmDR3PnX0RqRGth/Lu5fyFWoXNPfGxXTLORPFpfs8JKPh/eXGhlwc1f0v4VQzPay2KwVl6SGXvJD5qLXw=="; }; }; - "@textlint/ast-tester-13.0.4" = { + "@textlint/ast-tester-13.1.4" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.0.4.tgz"; - sha512 = "i/7bNipeeWsUqpYCxwxXXUmbiUBNJCZrVSVsZgFo1llJPa/uivyRy64Wgxy725GoWr3GdhAAGI3e7gtjGrZXjg=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.1.4.tgz"; + sha512 = "GH+PtICxEXI7OtOvMN3/T7SVLLdGUru5IOfnfQwZYwtdfdbwE+NnXVbAIcGopB2ZFvZPeVn+KsvZ+cCqeD+5Dw=="; }; }; "@textlint/ast-traverse-12.6.1" = { @@ -12055,22 +11452,22 @@ let sha512 = "Y/j7ip7yDuTjuIV4kTRPVnkJKfpI71U+eqXFnrM9sE2xBA9IsqzqiLQeDY+S5hhfQzmcEnZFtAP0hqrYaT6gNA=="; }; }; - "@textlint/ast-traverse-13.0.4" = { + "@textlint/ast-traverse-13.1.4" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.0.4.tgz"; - sha512 = "wK1HWrONMfJBhFby9Dpu2tEj0j1JRBlk1fVxLljBzmrV31v1nMI7Q9+ZMqGAZIZD7kDMUpHvGg7OsA6KjHiLcA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.1.4.tgz"; + sha512 = "PXsDtVDAq8GHg5gjbsYElR7I1hRbu0hOOAL46sI5V58cnR+aTys5RmKF7aaZYCuKEIrv/0yjmF8RSexCC/YpKQ=="; }; }; - "@textlint/config-loader-13.0.4" = { + "@textlint/config-loader-13.1.4" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.0.4.tgz"; - sha512 = "LGJeHEr3DosO1NlCOR3186Pqx2e2TcWAm3fydb3MD7kp5ko2mfMlGsJzo0wQOjuRGTtMV212b3OKsdKZBFo0TA=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.1.4.tgz"; + sha512 = "AoDBrGYG5Y1Ezghchp/Vfvj6A7YL0uiz3Ly2Md6zPqAKXvSv5WBZ+AjrDNAEeM+v79bmMYCu6SwJbrHJlZpKLw=="; }; }; "@textlint/feature-flag-12.6.1" = { @@ -12082,22 +11479,22 @@ let sha512 = "cY/AraTLdzbwDyAhdpaXB7n1Lw6zA+k+7UaT8mmxMmjs0uYGzdMQa499I0rQatctJ6izrdZXYW0NdUQfG2ugiA=="; }; }; - "@textlint/feature-flag-13.0.4" = { + "@textlint/feature-flag-13.1.4" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.0.4.tgz"; - sha512 = "mo4AaRrSbOgYhf6p+LSwo+UbMr62dsq12vMVqEkjHZ5tm5vrWbQkC2YrtMAM0ot9AY1x6RJFJ5ZO3Qn42N0JTQ=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.1.4.tgz"; + sha512 = "O/YXd/Mc2u8hMi7Y6SHidqtQl3u9kBKo2qvJUo3iBDN+Uubk/K4HAFR8fnioHa4OQBeVEZkiPz148KjDTtZkDQ=="; }; }; - "@textlint/fixer-formatter-13.0.4" = { + "@textlint/fixer-formatter-13.1.4" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.0.4.tgz"; - sha512 = "Sdx65V3e8Ggs2UBt/2VoN58w85YXOlaHnAoHV7aRoqMySHOf5You4y4Amby5AeHeXeltLXz1keLwloq5UiJdsQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.1.4.tgz"; + sha512 = "ibctHDGJid42hGj1JC33AwEgFy6Yxjy51dw5zm5ndW0XUZQoN4HuZnLfJPCkoFDnSOHDuiC5FZ77kESbad2pFA=="; }; }; "@textlint/kernel-12.6.1" = { @@ -12109,22 +11506,22 @@ let sha512 = "GjNaI36pYx/boy1Xf7NPJFbS0uWHhY9y9DMMl/8ZJZoldN7XrCvJFivNdeYQxu+LTmfGGaUJoTjDpnllOs6XSQ=="; }; }; - "@textlint/kernel-13.0.4" = { + "@textlint/kernel-13.1.4" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.0.4.tgz"; - sha512 = "lfZC2690xX7x5ZJn8kKfyx1/cD815+o5X80hbIjmhuY8pdoJgP4nqemaI/Y3Y+re/zg3YgT1PTayA6vcuxOw3g=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.1.4.tgz"; + sha512 = "Ek3g0/psMP+Uu0jLMCkAVckuyf96FjW4zNn++8YME1UEcj3Jmoh0gWBTTLrqEtFV0DHZOYwbibynynJUUNH8nQ=="; }; }; - "@textlint/linter-formatter-13.0.4" = { + "@textlint/linter-formatter-13.1.4" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.0.4.tgz"; - sha512 = "3hMOMlDIAgWPi1SXso35cqkwSzneH6qKdYGEpRejosSNTYePaY16ayRabQxPP07mx2m9X2Sa3ozrebq98Y9PXA=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.1.4.tgz"; + sha512 = "lmnMaP2wmwKCtTmP0+hthciaPPnSfd+PZdgn5zsYeGRxMxQUn4eOZ5bi85CVyr7BuA0jKBO02ZLBDJwQjZ9BIg=="; }; }; "@textlint/markdown-to-ast-12.6.1" = { @@ -12136,22 +11533,22 @@ let sha512 = "T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ=="; }; }; - "@textlint/markdown-to-ast-13.0.4" = { + "@textlint/markdown-to-ast-13.1.4" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.0.4.tgz"; - sha512 = "4Vs79pcBsFb7vzTp92K1ojhXQrNisK69e6QNVLc7sy8CdDhB4wWmP9tR783oBgvNgYrOfF5qwv8Z7ARCv+oFeg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.1.4.tgz"; + sha512 = "+H1x9RcBae6pOZeoMkqP6yPMPqPkumvLkp/n4xXNXpXM9C1c8bnxgoAcL0OuoJmJo34S5X8DKEuCRVX8r+IEuA=="; }; }; - "@textlint/module-interop-13.0.4" = { + "@textlint/module-interop-13.1.4" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.0.4.tgz"; - sha512 = "w63oM5dL1kbAdmg0JAcL6NU9r7x0xnsjGoimiUNx0nPZusBDjmFo18u//UwScDa3YmMYd10hQp+teAAsnsVuAg=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.1.4.tgz"; + sha512 = "lkJzOQowSPsTTntMEUQKEEkE53SaIAvGKxXHUAZ3J3MqF5FrRmAyHW+ZGhjO5N/eo3hui8/EuHGmHMC3kkduGw=="; }; }; "@textlint/source-code-fixer-12.6.1" = { @@ -12163,13 +11560,13 @@ let sha512 = "J9UZ3uitT+T50ug5X6AoIOwn6kTl54ZmPYBPB9bmH4lwBamN7e4gT65lSweHY1D21elOkq+3bO/OAJMfQfAVHg=="; }; }; - "@textlint/source-code-fixer-13.0.4" = { + "@textlint/source-code-fixer-13.1.4" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.0.4.tgz"; - sha512 = "C9SYHCQbgB6iJbRNtw+CUMRC7ACIqpLLMRDBw3VXyJfS4Ki9V3YZAlFvhe8kYTjeUe50skOQtDUMgvoIS5nNRA=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.1.4.tgz"; + sha512 = "Tzq/83EXVoYxCbQA17QuDbDhw9ynsO+Bz6Sd3aWyIck3yPPgw/ciZdoPyOaKBnfHMQBvL71Ha001y1mezETD2w=="; }; }; "@textlint/text-to-ast-12.6.1" = { @@ -12181,13 +11578,13 @@ let sha512 = "22tgSBaNerpwb66eCivjXmdZ3CDX2Il38vpuAGchiI+cl+sENU9dpuntxwEJdZQePX5qrkmw8XGj5kgyMF015A=="; }; }; - "@textlint/text-to-ast-13.0.4" = { + "@textlint/text-to-ast-13.1.4" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.0.4.tgz"; - sha512 = "KfR+4uuNOYQAwayzYNQUiv7GACvcjb+8ZOpJnpmu5FymI+c3g6EayYwt4cx01fmSLeZEL8njiyP1hQi3rzaR1g=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.1.4.tgz"; + sha512 = "hswGeU8ibagh/BzG+6dOyHYz3Kng0y8KdGTSZTSn/QGiFd+YGMj+0UlDbGLG3BvtNu2ERH5N1qEiaPlh/XNurQ=="; }; }; "@textlint/textlint-plugin-markdown-12.6.1" = { @@ -12199,13 +11596,13 @@ let sha512 = "fRKsFCL2fGeu0Bt+08FuEc2WHiI8IMDRvy6KT1pmNWO5irS4yL2/OXNknLH3erXvwcJw/hQnd5WEl4hQzS0Erw=="; }; }; - "@textlint/textlint-plugin-markdown-13.0.4" = { + "@textlint/textlint-plugin-markdown-13.1.4" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.0.4.tgz"; - sha512 = "2w0kIO3xgCMNeCxl0TuMCkOqHprpa+gKyI5EPXSy0sj6ksSHlW3hntiPI7MsMzTA90qMXhKSJQAVwYYQ6ntpTA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.1.4.tgz"; + sha512 = "T+6rKpJLZeUkzRW2toFkduSdHTjFm3D1wo3jghDtScNwextz/GBWLXqQp4DM9/dmYzkpVeBijq5PGCj8NRV1qQ=="; }; }; "@textlint/textlint-plugin-text-12.6.1" = { @@ -12217,13 +11614,13 @@ let sha512 = "ZUfG0Xb8qGymIPNp2eFTq9bHvkJo3N3Ia1Aff5W9fsgZib1/Eb55U16Sp60TjhBFns0/p7L7usBC3nd3+tB5mQ=="; }; }; - "@textlint/textlint-plugin-text-13.0.4" = { + "@textlint/textlint-plugin-text-13.1.4" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.0.4.tgz"; - sha512 = "wnAxJ4qQQrjur3zTiVhI6rxoO2vDV7ZCvR8i62LKzK8YyVN4tQM9P6NjiCwnZD0RaIyXTcYX6huiUBQZffmHHg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.1.4.tgz"; + sha512 = "l8DLa3z83k4SBo0QuXo3mwEdGyh7uIEPbeN/lj6fiEqDwKwLzURvghoSQMUj9ilNmF7quYXSuur+4IGCq4ruLA=="; }; }; "@textlint/types-12.6.1" = { @@ -12235,13 +11632,13 @@ let sha512 = "t1SZYahu2olnF8MUhlP6qDIEDyl7WmyIaBYxQdE2qU6xUkZWXS2zIxoAT/pVgvFCzDw3KO5HhIYGVeWRp90dTg=="; }; }; - "@textlint/types-13.0.4" = { + "@textlint/types-13.1.4" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-13.0.4.tgz"; - sha512 = "ZYnrp+s/MUl1IMvEu92zafLwA8x1vMFaHEZV6BGP3ELf2GZVLZYns2hGYtJse1vb/+/PYH6OCSOTZqfsGwKARg=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-13.1.4.tgz"; + sha512 = "M6t95O6xfHlZowRtEXNKpnkfyV9D3Wt4t8qFDpoF0Usuno700kxLczUDIXzja4UHPOlpW85vgx1mKCEfn/3IvA=="; }; }; "@textlint/utils-12.6.1" = { @@ -12253,13 +11650,13 @@ let sha512 = "HJkqYXT2FAAHDM5XLFpQLF/CEdm8c2ltMeKmPBSSty1VfPXQMi8tGPT1b58b8KWh6dVmi7w0YYB7NrquuzXOKA=="; }; }; - "@textlint/utils-13.0.4" = { + "@textlint/utils-13.1.4" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.0.4.tgz"; - sha512 = "BrSShnYFzCeIYWCTsIIe7GQcFhapQhXq6b3FdZ3CMaAz1apzTKTpukyjfL4Wdiai99XfAWFLko4sld/uWF3/KA=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.1.4.tgz"; + sha512 = "vGpXvqy2WrtZTy5qNAoOn1PrrdjTCC0AqIuZCGzHUd25t9GR77DUl7ifpT21lMK3NPl2IYcY2BpX6+MWYIA8wA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -12658,13 +12055,13 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.4.10" = { + "@types/eslint-8.21.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.4.10"; + version = "8.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz"; - sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz"; + sha512 = "35EhHNOXgxnUgh4XCJsGhE7zdlDhYDN/aMG6UbkByCFFNgQ7b3U+uVoqBpicFydR8JEfgdjCF7SJ7MiJfzuiTA=="; }; }; "@types/eslint-scope-3.7.4" = { @@ -12757,13 +12154,13 @@ let sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; - "@types/express-4.17.16" = { + "@types/express-4.17.17" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.16"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; - sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; "@types/express-serve-static-core-4.17.31" = { @@ -12820,6 +12217,15 @@ let sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; + "@types/glob-8.0.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-8.0.1.tgz"; + sha512 = "8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw=="; + }; + }; "@types/hast-2.3.4" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; @@ -13261,13 +12667,13 @@ let sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-16.18.11" = { + "@types/node-16.18.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.11"; + version = "16.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz"; - sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.12.tgz"; + sha512 = "vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw=="; }; }; "@types/node-16.9.1" = { @@ -13288,6 +12694,15 @@ let sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; + "@types/node-18.11.19" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.11.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz"; + sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -13468,6 +12883,15 @@ let sha512 = "XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="; }; }; + "@types/rimraf-3.0.2" = { + name = "_at_types_slash_rimraf"; + packageName = "@types/rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ=="; + }; + }; "@types/sass-1.43.1" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; @@ -13621,15 +13045,6 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/structured-source-3.0.0" = { - name = "_at_types_slash_structured-source"; - packageName = "@types/structured-source"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/structured-source/-/structured-source-3.0.0.tgz"; - sha512 = "8u+Wo5+GEXe4jZyQ8TplLp+1A7g32ZcVoE7VZu8VcxnlaEm5I/+T579R7q3qKN76jmK0lRshpo4hl4bj/kEPKA=="; - }; - }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -13900,13 +13315,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.49.0" = { + "@typescript-eslint/eslint-plugin-5.50.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz"; - sha512 = "IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz"; + sha512 = "vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13927,13 +13342,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.49.0" = { + "@typescript-eslint/parser-5.50.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz"; - sha512 = "veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz"; + sha512 = "KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13945,22 +13360,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.49.0" = { + "@typescript-eslint/scope-manager-5.50.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz"; - sha512 = "clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz"; + sha512 = "rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg=="; }; }; - "@typescript-eslint/type-utils-5.49.0" = { + "@typescript-eslint/type-utils-5.50.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz"; - sha512 = "eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz"; + sha512 = "dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13972,13 +13387,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.49.0" = { + "@typescript-eslint/types-5.50.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz"; - sha512 = "7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.50.0.tgz"; + sha512 = "atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13990,22 +13405,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.49.0" = { + "@typescript-eslint/typescript-estree-5.50.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz"; - sha512 = "PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz"; + sha512 = "Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow=="; }; }; - "@typescript-eslint/utils-5.49.0" = { + "@typescript-eslint/utils-5.50.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz"; - sha512 = "cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.50.0.tgz"; + sha512 = "v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -14017,13 +13432,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.49.0" = { + "@typescript-eslint/visitor-keys-5.50.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz"; - sha512 = "v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz"; + sha512 = "cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -14071,13 +13486,13 @@ let sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; }; }; - "@vercel/build-utils-6.0.0" = { + "@vercel/build-utils-6.1.0" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.0.0.tgz"; - sha512 = "2AoVcDUyQCj516KrRNH92NeKI+KZGnVGjHkcb+VcXxGspYpKL/gC+AdFtC05qbgxX1e8U95Yd8ROucTftHErWw=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.1.0.tgz"; + sha512 = "mDDbQ9plFNzkE+Kc/Xv4FweuQmnlKkuJw0QDdaHVeD4LixZ/yl2LXjRhQaVsnv/M9wR8piSjZUaj1Rvhakv2Tg=="; }; }; "@vercel/gatsby-plugin-vercel-analytics-1.0.7" = { @@ -14089,40 +13504,40 @@ let sha512 = "j4DsneQ+oOF0Zurvisj+H2ds8s8ZEqfI4iD6xgFY9mB2UdGixhzFRjvDBH6g4pfUQXfO76K5GiA1afumGlJbwA=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-1.0.2" = { + "@vercel/gatsby-plugin-vercel-builder-1.1.0" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.0.2.tgz"; - sha512 = "zhbLVDM8wdWK1Se0aYK5kB3w/LvR8ayzYSpeWZK2rzpTPmjWNbRBjJkWtoZvL5LlE4rEcSELaci7uxXIrflEag=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.1.0.tgz"; + sha512 = "FE/hsXlr2Pn7XbztEGrdljUm0N8DMWOOFBtSURTPZv+zwPWaTM7eO0DvKmRDQYYoxDP8C91pWH3C63ym2PWtDg=="; }; }; - "@vercel/go-2.2.31" = { + "@vercel/go-2.3.1" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.2.31"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.31.tgz"; - sha512 = "zDBxGi+M9AU18fNKSfZeD+hEALlIO/vQRD2kCh2f5k/Agjera6ughW0B3he+1s/M23vCDdx6N54E2j9GeTBZlQ=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.3.1.tgz"; + sha512 = "3bQGl8Zyu9dbUd1Oj5tZSMhtuptVrqNYj+4zghfbPXUnWIbK3zNFKVgMmH9Mp3sUmcSfuQod0+cxs538X5JHzw=="; }; }; - "@vercel/hydrogen-0.0.45" = { + "@vercel/hydrogen-0.0.47" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "0.0.45"; + version = "0.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.45.tgz"; - sha512 = "ZE/1scAUiuYZTEmO3CN08mGPo6dbORR8/tGDzsF//KYjTNcsKQJ+szVRqxUH5ZbazS4F2h1+wNDM0XHwKuLbLA=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.47.tgz"; + sha512 = "CjAiIKbknbW12JNQMbjRYkpQGUj8JzXfiyk6YnB8vltLB2jVtgPSIyD0ziRDZzgoeKacCcxgrJIIEnV4JbZueQ=="; }; }; - "@vercel/next-3.3.19" = { + "@vercel/next-3.3.21" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.3.19"; + version = "3.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.19.tgz"; - sha512 = "Adu3i4eHcQqLmRLCpJteilCTxfMLdr9grwk4Yq4g66xwRgkYTHiupkDN7hXThsxEBQgtotfcTUlygYYJjXvBkA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.21.tgz"; + sha512 = "arX4yZPkjQerHukgCM9TF471zoXIL189VPLgzDY9JzteIAYxxF3v0wNIi1i4T4Secg5j3RyPlAM2/17sIKbQzw=="; }; }; "@vercel/nft-0.22.5" = { @@ -14134,13 +13549,13 @@ let sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.8.16" = { + "@vercel/node-2.9.0" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.8.16"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.16.tgz"; - sha512 = "aLuPHOm29cYjCK649/5j/zbYFXxRtNYcnNFdBd2gVg2II54SfByYIx/Tw3A6PeQmR23piBwPZMI5uEuYC0TGmA=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.9.0.tgz"; + sha512 = "I87lBDUdZnzUzZgFxIk4FUj207EBcm7mVEHW3yN0V9Z3jTfg8PJDe8T2OeJFsKpYsI58nzSAYYA8viKJjrVcdg=="; }; }; "@vercel/node-bridge-3.1.10" = { @@ -14152,31 +13567,31 @@ let sha512 = "0DQzF5pdyP+xd5f1Ss2fAO+9xIvzUhngRAPazwg4XHZE9iLkv2L+A1u3L8NYi4hoUlAAZQ5GF3txlm/oBn4tNw=="; }; }; - "@vercel/python-3.1.41" = { + "@vercel/python-3.1.43" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.41"; + version = "3.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.41.tgz"; - sha512 = "xS3LY1zzuKM2wTeW9tTQqQ3gNgsstSWMO8dnxcuFnYMP8JwN4ffLSreXeJm4S5pFsn5dNyH1EckgoXWgB9TgBQ=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.43.tgz"; + sha512 = "PP3klds6nF3SgRVqlXKIQiFgNp/nMJ/iXxl58i6EcSIg3o00S9WRCNhtutX4jjXytFmwnAZWEzavyO4++0LxVQ=="; }; }; - "@vercel/redwood-1.0.52" = { + "@vercel/redwood-1.0.54" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.0.52"; + version = "1.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.52.tgz"; - sha512 = "ZZ+qWdYRYfL5wKYao4/oXHxbGpoN6MJEN+YtiOSCauDfolN/7c+qFbZu4P6MdEddY4/3Kq1CRMy9z89UfPPzew=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.54.tgz"; + sha512 = "svsG3Q0mvq4ik1yCA/f4ECkU3A+R4Ae0z09YgT4+jzXyiYYmD+MYpyW6urT/l5/4Alr2NVUODhuHrkJJA+cbyA=="; }; }; - "@vercel/remix-1.2.8" = { + "@vercel/remix-1.2.10" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.2.8"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.8.tgz"; - sha512 = "30Cfc+tl6L+L4+c9fGTBfS8YbCSfP/plqf+bTSHHU9wIGWmq/oKpIxInRbcT2+7oAb+EdehMDoZ1r/L7me7Dew=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.10.tgz"; + sha512 = "yEt5XPydHMbB1MPYlmX55M0Oxal4R3qJogTqRkPXYLvEv9pHwaq7QcvJ4+tIDeyKe4XzBHDFWKaupXi09kqEOQ=="; }; }; "@vercel/routing-utils-2.1.8" = { @@ -14188,31 +13603,31 @@ let sha512 = "rng+qyQ0VpnBjO2R7GQlpAdEx+yyvrcEp6XNe+4q6e+oW0n2H6dm6SLFEBA6B1QmHX4OTTCkq1GIiKsK6ENw4Q=="; }; }; - "@vercel/ruby-1.3.57" = { + "@vercel/ruby-1.3.59" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.57"; + version = "1.3.59"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.57.tgz"; - sha512 = "AY9bhSwDPcWt20KNskpn/zGF8nP7JBkfWbddXwF0uP2Ui55b+hnBr2VjRf2qys2npOZu2O2jd70/KCOUGnkdIw=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.59.tgz"; + sha512 = "I+HQHf5fbQ4yMlcRZ8p1OstauFjpgh8AFwlgzjTa66rsegTo+0StJDQsAiEkLC3F/Hfj6w9BcOG3HUddo2OwVQ=="; }; }; - "@vercel/static-build-1.3.0" = { + "@vercel/static-build-1.3.2" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.0.tgz"; - sha512 = "Ai9xpqkMCxXT8lHtyn+qE9N+fQSdlBv9ph0ldeKdc+BhDx8T91LzAoCxqT2XnNii0TIakD2k/ZI/qusqTTMe6Q=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.2.tgz"; + sha512 = "kNyuArBsR6w+K1cqR6gFIOmdLp5DWsXFoY84JJB1+Q84+W3+Z+xIqsTBy/LI4hS5RJeeGE9iv7vfFe3YIxQq/A=="; }; }; - "@vercel/static-config-2.0.11" = { + "@vercel/static-config-2.0.12" = { name = "_at_vercel_slash_static-config"; packageName = "@vercel/static-config"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.11.tgz"; - sha512 = "dw6CAJ7U2AcQpjZV9YfOyz2wTseSFdkT3qivBg2GjHtVyd5wdY7vkQ9seLKEckYhFx3CjQ29IhzhDND9F5oINw=="; + url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.12.tgz"; + sha512 = "mkTS3t6RV6Fu7G21LpegEuuHl9rwfyNkoBvsNV5BBP0h7/3OzHwHip+t20oKWk3IrWu5ic0nbLNhyARdkeA1hQ=="; }; }; "@vscode/emmet-helper-2.8.6" = { @@ -14224,6 +13639,15 @@ let sha512 = "IIB8jbiKy37zN8bAIHx59YmnIelY78CGHtThnibD/d3tQOKRY83bYVi9blwmZVUZh6l9nfkYH3tvReaiNxY9EQ=="; }; }; + "@vscode/l10n-0.0.10" = { + name = "_at_vscode_slash_l10n"; + packageName = "@vscode/l10n"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz"; + sha512 = "E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="; + }; + }; "@vscode/l10n-0.0.11" = { name = "_at_vscode_slash_l10n"; packageName = "@vscode/l10n"; @@ -14233,13 +13657,13 @@ let sha512 = "ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="; }; }; - "@vscode/test-electron-2.2.2" = { + "@vscode/test-electron-2.2.3" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.2.tgz"; - sha512 = "s5d2VtMySvff0UgqkJ0BMCr1es+qREE194EAodGIefq518W53ifvv69e80l9e2MrYJEqUUKwukE/w3H9o15YEw=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.3.tgz"; + sha512 = "7DmdGYQTqRNaLHKG3j56buc9DkstriY4aV0S3Zj32u0U9/T0L8vwWAC9QGCh1meu1VXDEla1ze27TkqysHGP0Q=="; }; }; "@vue/cli-overlay-4.5.19" = { @@ -14341,22 +13765,22 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.2.45" = { + "@vue/compiler-core-3.2.47" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz"; - sha512 = "rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz"; + sha512 = "p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig=="; }; }; - "@vue/compiler-dom-3.2.45" = { + "@vue/compiler-dom-3.2.47" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"; - sha512 = "tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz"; + sha512 = "dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ=="; }; }; "@vue/compiler-sfc-2.7.14" = { @@ -14368,22 +13792,22 @@ let sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; - "@vue/compiler-sfc-3.2.45" = { + "@vue/compiler-sfc-3.2.47" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"; - sha512 = "1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz"; + sha512 = "rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ=="; }; }; - "@vue/compiler-ssr-3.2.45" = { + "@vue/compiler-ssr-3.2.47" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"; - sha512 = "6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz"; + sha512 = "wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -14422,22 +13846,22 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/reactivity-transform-3.2.45" = { + "@vue/reactivity-transform-3.2.47" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz"; - sha512 = "BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz"; + sha512 = "m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA=="; }; }; - "@vue/shared-3.2.45" = { + "@vue/shared-3.2.47" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz"; - sha512 = "Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz"; + sha512 = "BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="; }; }; "@vue/web-component-wrapper-1.3.0" = { @@ -15169,13 +14593,49 @@ let sha512 = "GWZQKroPES4z91Ijx6zsOsb7+USOxjy66s8AoTWg0HiBBdfnbtf9aeh3Uav0MgYn4BL8Q7tVSUpd0gGpngKGEQ=="; }; }; - "@whatwg-node/fetch-0.6.2" = { + "@whatwg-node/events-0.0.2" = { + name = "_at_whatwg-node_slash_events"; + packageName = "@whatwg-node/events"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@whatwg-node/events/-/events-0.0.2.tgz"; + sha512 = "WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w=="; + }; + }; + "@whatwg-node/fetch-0.6.5" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.6.2"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.6.2.tgz"; - sha512 = "fCUycF1W+bI6XzwJFnbdDuxIldfKM3w8+AzVCLGlucm0D+AQ8ZMm2j84hdcIhfV6ZdE4Y1HFVrHosAxdDZ+nPw=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.6.5.tgz"; + sha512 = "3XQ78RAMX8Az0LlUqMoGM3jbT+FE0S+IKr4yiTiqzQ5S/pNxD52K/kFLcLQiEbL+3rkk/glCHqjxF1QI5155Ig=="; + }; + }; + "@whatwg-node/fetch-0.6.7" = { + name = "_at_whatwg-node_slash_fetch"; + packageName = "@whatwg-node/fetch"; + version = "0.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.6.7.tgz"; + sha512 = "n29y5RtM7pmH9VXFC4flV0Kv0VZIoLJcncDki/bTpxC525EFLze5JR9l+WmPYBNfLQgMtDti30ANuOmbETeubw=="; + }; + }; + "@whatwg-node/node-fetch-0.0.1" = { + name = "_at_whatwg-node_slash_node-fetch"; + packageName = "@whatwg-node/node-fetch"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.0.1.tgz"; + sha512 = "dMbh604yf2jl37IzvYGA6z3heQg3dMzlqoNsiNToe46SVmKusfJXGf4KYIuiJTzh9mEEu/uVF//QakUfsLJpwA=="; + }; + }; + "@whatwg-node/node-fetch-0.0.3" = { + name = "_at_whatwg-node_slash_node-fetch"; + packageName = "@whatwg-node/node-fetch"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.0.3.tgz"; + sha512 = "kUFCR5Qf8n5FYqhk5PzEi8WoCoP89MhlvZzDnoKcCjne8VM5rW8bjJMnSO/4oMHLIN+hqHD1pDeN63xmmpmtIA=="; }; }; "@withgraphite/graphite-cli-routes-0.23.0" = { @@ -15520,13 +14980,13 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.36" = { + "@yarnpkg/parsers-3.0.0-rc.38" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.36"; + version = "3.0.0-rc.38"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.36.tgz"; - sha512 = "PvTlgUr7WO2qDnph8tVdItbJlo9hEcGSVd8+ppn/tvcn8XZUaD1z4EgvMEZcJYZi3LmHJGzSgVZzcFE+zQiz8A=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.38.tgz"; + sha512 = "YqkUSOZSBjbhzvU/ZbK6yoE70L/KVXAQTyUMaKAFoHEpy7csAljivTBu0C3SZKbDxMRjFWAvnLS8US7W3hFLow=="; }; }; "@zeit/schemas-2.29.0" = { @@ -15565,76 +15025,76 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-10.5.2" = { + "@zwave-js/cc-10.6.0" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "10.5.2"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.5.2.tgz"; - sha512 = "RBuAJ6cWlhZTLDDppWx6ILmqXATN9L8lyIfjSbNIzdlJ6jzJK1sW7r+rvXlcubAOPdDBEQa2UYbCJ/PEdFdoBg=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.6.0.tgz"; + sha512 = "CZTPYNvagCaCP5IB0sLYQSgFJIzezBbthXkfCFIN208EasRtOfvTDkPYU786y4V3XvS2xQTGC2BQ/xGdSttF/Q=="; }; }; - "@zwave-js/config-10.5.2" = { + "@zwave-js/config-10.6.0" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "10.5.2"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.5.2.tgz"; - sha512 = "nnXehRQZlOSwvKOhDuLkjwkyR2dZVaNOqwxz9UKcovclIZyXV+1V2VhAxa0BeIyidDZYV/Ma2SzT4lGckW/3WQ=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.6.0.tgz"; + sha512 = "5dOkLUobOgxjXndJdtwZdpoBAhkaNJaFYxxli3QR3g6EKMq0vCQD5TczE4/k9BVuX+s0uWC9w6d1sukagf3OLA=="; }; }; - "@zwave-js/core-10.5.0" = { + "@zwave-js/core-10.6.0" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "10.5.0"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.5.0.tgz"; - sha512 = "l5/YwSZMMg8MeUhi8bCnS2xu1EYFO9ocY9Zl2LWXF/8xMYKqZohgxjkUg4YzbIoTyE5vGuaxVoBHqQ4iQ7xj3g=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.6.0.tgz"; + sha512 = "2gczRjrYcaaZLupWJuoMYp9MEH4paIQ1spxUWW8vKgGIULhhutyWqAmdoHuhiFMwOkqrZieGKhmzsJRWNnLLqw=="; }; }; - "@zwave-js/host-10.5.2" = { + "@zwave-js/host-10.6.0" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "10.5.2"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.5.2.tgz"; - sha512 = "BTbIWobUI/YYlSe35U/hDkA/zyMFtktEyLis17r/FTYZR35zcmKO/jHpwwKii/EELsxTrCJnXMh017NrhJlpKA=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.6.0.tgz"; + sha512 = "R87TGHX4GUxAdLj9GzopcN7n9wBYpL7iEUnE11AFr+7X1DfxJ7dlqC4LU2Pah+DqGX0yRsG0OMB6f8bWrMLECg=="; }; }; - "@zwave-js/nvmedit-10.5.0" = { + "@zwave-js/nvmedit-10.6.0" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "10.5.0"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.5.0.tgz"; - sha512 = "kXTToCLTytqdLBCfVZN1HaB7F4SrW8TVO/xMmG9D3n3yMEMaSDHRXobym9kOOb5aVwVCplASQiHwY+pL4t5R9A=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.6.0.tgz"; + sha512 = "PMxhhvNShpYwIzPT+FD8jAghRsnhks59bSLIOLVUMsytadT5f7PYcQB7Q0kk9aUQPpY/l++FdUSzvKQh6wSejQ=="; }; }; - "@zwave-js/serial-10.5.2" = { + "@zwave-js/serial-10.6.0" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "10.5.2"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.5.2.tgz"; - sha512 = "IqAYBhNE+LsEVSRu2UDzoM3inV2dp3JMfIJXBN8iVa/revCXTjGWOPJkqhulj74cQX9brCuA919YQ33N9hlJwA=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.6.0.tgz"; + sha512 = "+2zDjt3vpiiIoBcADrFIjm+kUI7qgSuE8CNQhXrzq9u/Gvbb/XTMLzNER4mcJ0hung13hVAAKeLEdT5HGrfDXA=="; }; }; - "@zwave-js/shared-10.4.0" = { + "@zwave-js/shared-10.6.0" = { name = "_at_zwave-js_slash_shared"; packageName = "@zwave-js/shared"; - version = "10.4.0"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.4.0.tgz"; - sha512 = "uuLYDDNqIkagJ40piNMhljVG9OepI31/labLnivJByxGdELJnIXGRKLQ8ZKvm/5Ba8qXpEw/t7UrV2plfP/QCg=="; + url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.6.0.tgz"; + sha512 = "5KWQ7otpm6KqWFceqr5Ul8yjeh5s8oNG/m7YjjfkRBC9FTD6T7CQ0exadopHpZjYInYA3DC74TFJ8HkU78IaCw=="; }; }; - "@zwave-js/testing-10.5.2" = { + "@zwave-js/testing-10.6.0" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "10.5.2"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.5.2.tgz"; - sha512 = "3Si/nerD7I9pPpgiipUZqrEJUTNeFAPnbgXG9P5mZb+uhHzbrwVVDASK9wPgjGqWx2AJffAMl2MPEknqcMEaRA=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.6.0.tgz"; + sha512 = "NrVo4a7HBfpqtbxrr2UVkWNJBSeyUzen1vMACtzO15HSJuJhA0BHUM4TaBLbhshP63T2j9Olf20E5k+Pwiameg=="; }; }; "CSSselect-0.4.1" = { @@ -16204,15 +15664,6 @@ let sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; }; }; - "aglfn-1.0.2" = { - name = "aglfn"; - packageName = "aglfn"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aglfn/-/aglfn-1.0.2.tgz"; - sha512 = "HUvXd7sNFa1aHtYgJnln2jPwzq7UAAOXhYH/+AY6BMdfXxprMxG8IrczlZn6MjjIWpYhpKR5mHwDWTgehZKO4g=="; - }; - }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -18211,13 +17662,13 @@ let sha512 = "uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw=="; }; }; - "async-each-1.0.4" = { + "async-each-1.0.6" = { name = "async-each"; packageName = "async-each"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.4.tgz"; - sha512 = "qL5v0vnRtD4rxlrzLz3WMnMfTvTrMf3IK1xFCF0Q5vqXJkULhM13gO2ynE8RZMjE+bPcH0AUHgcd5BU1FtO1tA=="; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz"; + sha512 = "c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg=="; }; }; "async-each-series-0.1.1" = { @@ -18481,6 +17932,15 @@ let sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; }; }; + "atomically-2.0.0" = { + name = "atomically"; + packageName = "atomically"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atomically/-/atomically-2.0.0.tgz"; + sha512 = "KpioFPR6tOK/u3z1tFplHI9l2yK3Nu8cl47gAsTfPT6i2UClTXoqOk8dZqGIwWWopen4bSP5HnlaPUDWC7IfKw=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -18553,13 +18013,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.15.8" = { + "aws-crt-1.15.9" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.15.8"; + version = "1.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.8.tgz"; - sha512 = "2TLgxvcHwYaCpaZWwMTn7628Xa7mcpedE+pdGf+Vg2l6MiTrRKZ5X5YyXMqX4GvfvDB1I3EfIAi5iFxlHZ1J4w=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.9.tgz"; + sha512 = "tInTJwASvrj+iIQZd+p/S3fUf2nWp3mNQv+TJHndZIllCQg3tcy8vF6pkXR++3fF/eAIOYnr7adf7z2/JneJ8g=="; }; }; "aws-sdk-1.18.0" = { @@ -18580,13 +18040,13 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1304.0" = { + "aws-sdk-2.1309.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1304.0"; + version = "2.1309.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz"; - sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1309.0.tgz"; + sha512 = "EC/EtDDWDoJnovvmNlJqvojNJMbFZ78HESzgFiond5vzPS+FIWnWgGJ1ZVvIWU9O4X5I8cEMckwHCTfVYNcZxA=="; }; }; "aws-sign2-0.6.0" = { @@ -18688,13 +18148,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.2.6" = { + "axios-1.3.2" = { name = "axios"; packageName = "axios"; - version = "1.2.6"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; - sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz"; + sha512 = "1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw=="; }; }; "axios-cookiejar-support-0.5.1" = { @@ -20920,13 +20380,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.21.4" = { + "browserslist-4.21.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.4"; + version = "4.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"; + sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w=="; }; }; "brq-0.1.8" = { @@ -21776,13 +21236,13 @@ let sha512 = "+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="; }; }; - "cacheable-request-10.2.5" = { + "cacheable-request-10.2.6" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "10.2.5"; + version = "10.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.5.tgz"; - sha512 = "5RwYYCfzjNPsyJxb/QpaM0bfzx+kw5/YpDhZPm9oMIDntHFQ9YXeyV47ZvzlTE0XrrrbyO2UITJH4GF9eRLdXQ=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.6.tgz"; + sha512 = "fhVLoXIFHvTizxQkAVohKPToSzdwzjrhL5SsjHT0umeSCxWeqJOS0oPqHg+yO1FPFST3VE5rxaqUvseyH9JHtg=="; }; }; "cacheable-request-2.1.4" = { @@ -22127,13 +21587,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001449" = { + "caniuse-lite-1.0.30001450" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001449"; + version = "1.0.30001450"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz"; - sha512 = "CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz"; + sha512 = "qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew=="; }; }; "canvas-2.11.0" = { @@ -22289,22 +21749,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.6.32" = { + "cdk8s-2.6.40" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.6.32"; + version = "2.6.40"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.32.tgz"; - sha512 = "JofFfr6+qpFeUiZcVK8NwWdjgz5z4b7ZZrKSwOrbvE2g441X+EEu4F3HfWEt4q68RvdaLkvIAFZki/4k4XEp3A=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.40.tgz"; + sha512 = "YO92if35Ot5aRr150i7U0XpfRURWw0IAkoHu/9ZC0gjcJwlxZPS+GK0ENW0o2DB1G2/AfN0pWu9QtNcFcP7ZKQ=="; }; }; - "cdk8s-plus-25-2.4.3" = { + "cdk8s-plus-25-2.4.12" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.4.3"; + version = "2.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.3.tgz"; - sha512 = "oD1yQFUpazobHUOOuWOIjng0iKYkB8IGx7w4XIA7Un3jqU2jGqiRT+nEy94KidAMOBjUcJp6GPBDqrTB6K8YoQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.12.tgz"; + sha512 = "YP8cMpu29X028gPrAJHLk99ISKSfgU2bTkR9H0QxHl77uooGNlMvzr7G3GMBlnan93Qtyvd6rHmr6ui9pSDDZQ=="; }; }; "cdktf-0.15.2" = { @@ -23513,15 +22973,6 @@ let sha512 = "Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg=="; }; }; - "clipper-lib-6.4.2" = { - name = "clipper-lib"; - packageName = "clipper-lib"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-6.4.2.tgz"; - sha512 = "knglhjQX5ihNj/XCIs6zCHrTemdvHY3LPZP9XB2nq2/3igyYMFueFXtfp84baJvEE+f8pO1ZS4UVeEgmLnAprQ=="; - }; - }; "cliss-0.0.2" = { name = "cliss"; packageName = "cliss"; @@ -23945,13 +23396,13 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; - "codemaker-1.73.0" = { + "codemaker-1.74.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.73.0.tgz"; - sha512 = "pgVFCAbR0Yw/qTrV/W8R7cXWJouhONMRf8sNCjmAGJyV3MFaLN4sUPdUkzYUu7LCkuHPh0nvYRlExWzrkhm7vw=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.74.0.tgz"; + sha512 = "i6fAyWpXAYN/dd8hvzFPJ7+Yb/a23+BmeCu/lPn0KDpDs/KpNKoz/I3Iq9JD4AL9bMc1b7kBeBV+UF6kS6EMEg=="; }; }; "codepage-1.4.0" = { @@ -24782,6 +24233,15 @@ let sha512 = "8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="; }; }; + "conf-11.0.1" = { + name = "conf"; + packageName = "conf"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-11.0.1.tgz"; + sha512 = "WlLiQboEjKx0bYx2IIRGedBgNjLAxtwPaCSnsjWPST5xR0DB4q8lcsO/bEH9ZRYNcj63Y9vj/JG/5Fg6uWzI0Q=="; + }; + }; "conf-6.2.4" = { name = "conf"; packageName = "conf"; @@ -25052,13 +24512,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.233" = { + "constructs-10.1.241" = { name = "constructs"; packageName = "constructs"; - version = "10.1.233"; + version = "10.1.241"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.233.tgz"; - sha512 = "Km1hjAx2e303J5YH64PwTxESrJZG067p3egdneoC4kgr158V9ES+i3roeBTc9hjR0zyM2GEfS6jaVUibEi9VjQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.241.tgz"; + sha512 = "/PgIzuoDHcEvOUtka5T4Y9zzXqKAn7n448GkCjeOz3tk+i16ytC57of8D/d+XV3UGHQkjAsxlrJtUwx2KpIQfQ=="; }; }; "consume-http-header-1.0.0" = { @@ -25124,13 +24584,22 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; + "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=="; + }; + }; "content-type-git+https://github.com/wikimedia/content-type.git#master" = { name = "content-type"; packageName = "content-type"; version = "1.0.1"; src = fetchgit { url = "https://github.com/wikimedia/content-type.git"; - rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + rev = "cd73e64490f9620329fe4ed6e3ac383abb6bdee0"; sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; @@ -25656,13 +25125,13 @@ let sha512 = "/XM+/wFag72bD4SNSxwX8b3OWatHNNlnmJpgb5pepp2Pobb957nWyR0GPwIkKyOyszdZesWM3Vv8uH9e2Z1k2w=="; }; }; - "cordova-serve-4.0.0" = { + "cordova-serve-4.0.1" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz"; - sha512 = "gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw=="; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz"; + sha512 = "YbfXaZ60yr5dkqmDFQgrU7TSKnzCqYsxHgIUzDeX8RggZb6mz1F9jMfUBbaYyaU7JjcuJ0aoRPYLvwSGQVhGkw=="; }; }; "core-js-2.6.12" = { @@ -26241,22 +25710,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-6.19.2" = { + "cspell-dictionary-6.22.0" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.19.2.tgz"; - sha512 = "XLVIsoiy97VAtC4V3tNJkYU7CqWuSejrXIyLdzIaN4yBsC1kOrV1fwJ3vaAuSIqQauDYeST2gBIsHcDuGYEcew=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.22.0.tgz"; + sha512 = "O74nn6wwNAxhbNoIceUCxS4I/1L4JLEGlfICBXR4OxSR6S2A5JK5Qkq8fL0h660Lm3C99J1JLLJDUrny1Sk5Zg=="; }; }; - "cspell-gitignore-6.19.2" = { + "cspell-gitignore-6.22.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.19.2.tgz"; - sha512 = "dPxGxakkBs5dmD+nCom6t74ejWsd6RJJkgs0sccPDFKULXAInjeKMeTraskYTg4wXqybbiuXCB2sOIdeQmNq6w=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.22.0.tgz"; + sha512 = "iSc50FdY5tKXH950J56BhI6zLBE4O7wHOwmzzkb/tiAeni5krTyNdfxiJNKEvk/0kLct8zve9GHFr13iV0tdhQ=="; }; }; "cspell-glob-0.1.25" = { @@ -26268,22 +25737,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-6.19.2" = { + "cspell-glob-6.22.0" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.19.2.tgz"; - sha512 = "raco5vbd3Exb1uQaD5Bn6aS0KpRbNM7etmn/Q2T2KSwhvH+DRSEMTAkSG3rb0+y0ixkA/Qspjt68QnYxsbFPmw=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.22.0.tgz"; + sha512 = "YVQ5Sw3xt8xTueiuLH1nadMwQzIqDok6BSrTQZbrD8CPnaDanyRqyxJUzIJVd3on4IyQ4ZNnlUXZURaXFX2cTQ=="; }; }; - "cspell-grammar-6.19.2" = { + "cspell-grammar-6.22.0" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.19.2.tgz"; - sha512 = "f1IswIPxHX0uQaFzmDWJtgWVd3KkFElTnxj0cgvSZs8ehEaC+/jT30q4K36oVA7jgLtdLuDXafQf9Lp2FHf9bA=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.22.0.tgz"; + sha512 = "52DvVkkSoge91+Z7VgeMYUDaMafdhYGwQleW7BTW3GK+T9y9zl7OTwjxhfqkZ+CG8ImyBsIDyrEsSLqQ1Lepuw=="; }; }; "cspell-io-4.1.7" = { @@ -26295,13 +25764,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-6.19.2" = { + "cspell-io-6.22.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.19.2.tgz"; - sha512 = "ZVyygx4N8cTF2HeNUXV7IpX/LXSOSCNE+W3gY4/fju1PJWh+roTf7pVDURGtMxpSV7cq44ewYA3/qCgnF8QnkA=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.22.0.tgz"; + sha512 = "k3rsbDm2nqXpcW+/K/URJ7AQshmZ2CNqaUQ4m0nDNUoe/C9ITj13ROWXQYiA3i4Z4icVIN6t/jOmAKmKI6UTUA=="; }; }; "cspell-lib-4.3.12" = { @@ -26313,13 +25782,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-6.19.2" = { + "cspell-lib-6.22.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.19.2.tgz"; - sha512 = "phPyt68bKeTUZKdmnjke2ffnIJPaXLdiUFAeU0kMNk15ljkczjMR4J6WkgYCKc+SCNQjYJSS+z4nLbtQivqDxg=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.22.0.tgz"; + sha512 = "+XWp2GBmZeUiacLPH+skpiDMpX+xp7Pp9I306NQ2FqnxmM05aqIxh0q7fQaeSNS4HV9x8z6noYPjoo01tbaDsg=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -26331,13 +25800,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-6.19.2" = { + "cspell-trie-lib-6.22.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.19.2.tgz"; - sha512 = "4rfiq0FeSlLG1hBQv5DpOgsbOzNs5hGz/V6Kmv0gbqaxRZyw+8sYECqdTNDx+0OXMgSRhUrwMoCpCMyWiq7tBA=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.22.0.tgz"; + sha512 = "DFil6sYyjVbS5ZSiz4ZSrcZ7+601S65/T7snoHINHsRSgcznTJrgpYR0I0ZYHm8P2heT3RBpWwaAcbD5bbyw9Q=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -26862,13 +26331,13 @@ let sha512 = "byxnDBxM1AVF3YfmsK7Smop9/usNz7gAZYSo9eYp61TGcNXraJby1rAiLyJSt1/8Iho2qaxZOtZCOvQMXogPtg=="; }; }; - "csv-parse-5.3.3" = { + "csv-parse-5.3.4" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.3.3"; + version = "5.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.3.tgz"; - sha512 = "kEWkAPleNEdhFNkHQpFHu9RYPogsFj3dx6bCxL847fsiLgidzWg0z/O0B1kVWMJUc5ky64zGp18LX2T3DQrOfw=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.4.tgz"; + sha512 = "f2E4NzkIX4bVIx5Ff2gKT1BlVwyFQ+2iFy+QrqgUXaFLUo7vSzN6XQ8LV5V/T/p/9g7mJdtYHKLkwG5PiG82fg=="; }; }; "csv-stream-0.2.0" = { @@ -27825,6 +27294,15 @@ let sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; }; }; + "debounce-fn-5.1.2" = { + name = "debounce-fn"; + packageName = "debounce-fn"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-5.1.2.tgz"; + sha512 = "Sr4SdOZ4vw6eQDvPYNxHogvrxmCIld/VenC5JbNrFwMiwd7lY/Z18ZFfo+EWNG4DD9nFlAujWAo/wGuOPHmy5A=="; + }; + }; "debounced-seeker-1.0.0" = { name = "debounced-seeker"; packageName = "debounced-seeker"; @@ -28329,6 +27807,15 @@ let sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; + "deepmerge-4.3.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; + sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -29661,6 +29148,15 @@ let sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; }; }; + "dot-prop-7.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-7.2.0.tgz"; + sha512 = "Ol/IPXUARn9CSbkrdV4VJo7uCy1I3VuSiWCaFSg+8BdUOzF9n3jefIpcgAydvUZbTdEBZs2vEiTiS9m61ssiDA=="; + }; + }; "dotenv-10.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -30138,13 +29634,13 @@ let sha512 = "r1NDtlajsq7gf2EXgjRfblCVPquvD2yeg+6XGErOKblvxOpDi0iulZLVhgYDP4AEF1P5/HgbX/vwjlkEv7PEIQ=="; }; }; - "electron-to-chromium-1.4.284" = { + "electron-to-chromium-1.4.286" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.284"; + version = "1.4.286"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.286.tgz"; + sha512 = "Vp3CVhmYpgf4iXNKAucoQUDcCrBQX3XLBtwgFqP9BUXuucgvAV9zWp1kYU7LL9j4++s9O+12cb3wMtN4SJy6UQ=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -30707,6 +30203,15 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; + "env-paths-3.0.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz"; + sha512 = "dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A=="; + }; + }; "env-string-1.0.1" = { name = "env-string"; packageName = "env-string"; @@ -31059,15 +30564,6 @@ let sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; }; }; - "esbuild-0.16.17" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.16.17"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz"; - sha512 = "G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg=="; - }; - }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -31806,6 +31302,15 @@ let sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; }; + "eslint-8.33.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz"; + sha512 = "WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA=="; + }; + }; "eslint-config-prettier-6.15.0" = { name = "eslint-config-prettier"; packageName = "eslint-config-prettier"; @@ -31896,13 +31401,13 @@ let sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; }; }; - "eslint-plugin-react-7.32.1" = { + "eslint-plugin-react-7.32.2" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; - version = "7.32.1"; + version = "7.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz"; - sha512 = "vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www=="; + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz"; + sha512 = "t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg=="; }; }; "eslint-plugin-react-hooks-4.6.0" = { @@ -32895,6 +32400,15 @@ let sha512 = "skAUXERKw1gtSw8xsvft9DE0KVhBvw4dujAtgCZoG2l513fN7ds+B5+30ZVgZATMC+EjtlmjKXzhp5QS44DCFA=="; }; }; + "expo-modules-autolinking-1.1.0" = { + name = "expo-modules-autolinking"; + packageName = "expo-modules-autolinking"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.1.0.tgz"; + sha512 = "iObm4er+lx57QXrX0pdxkeGv34/OCVoycURumnqXDk+0QK1TJ23MNHvzerO5QR7+5t8g0R3vVjyEvG/3m+w6Gw=="; + }; + }; "expo-modules-core-1.1.1" = { name = "expo-modules-core"; packageName = "expo-modules-core"; @@ -34173,15 +33687,6 @@ let sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; }; }; - "file-type-9.0.0" = { - name = "file-type"; - packageName = "file-type"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"; - sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -34722,13 +34227,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.198.2" = { + "flow-parser-0.199.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.198.2"; + version = "0.199.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.198.2.tgz"; - sha512 = "tCQzqXbRAz0ZadIhAXGwdp/xsusADo8IK9idgc/2qCK5RmazbKDGedyykfRtzWgy7Klt4f4NZxq0o/wFUg6plQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.199.1.tgz"; + sha512 = "Mt+GFUQYij3miM7Z6o8E3aHTGXZKSOhvlCFgdQRoi6fkWfhyijnoX51zpOxM5PmZuiV6gallWhDZzwOsWxRutg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -35019,13 +34524,13 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-7.2.14" = { + "fork-ts-checker-webpack-plugin-7.3.0" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "7.2.14"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz"; - sha512 = "Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.3.0.tgz"; + sha512 = "IN+XTzusCjR5VgntYFgxbxVx3WraPRnKehBFrf00cMSrtUuW9MsG9dhL6MWpY6MkjC3wVwoujfCDgZZCQwbswA=="; }; }; "fork-ts-checker-webpack-plugin-v5-5.2.1" = { @@ -35091,15 +34596,6 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "form-data-encoder-1.7.2" = { - name = "form-data-encoder"; - packageName = "form-data-encoder"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz"; - sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; - }; - }; "form-data-encoder-2.1.4" = { name = "form-data-encoder"; packageName = "form-data-encoder"; @@ -35136,15 +34632,6 @@ let sha512 = "varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="; }; }; - "formdata-node-4.4.1" = { - name = "formdata-node"; - packageName = "formdata-node"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz"; - sha512 = "0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ=="; - }; - }; "formdata-polyfill-4.0.10" = { name = "formdata-polyfill"; packageName = "formdata-polyfill"; @@ -35505,13 +34992,13 @@ let sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; }; - "fs-minipass-3.0.0" = { + "fs-minipass-3.0.1" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz"; - sha512 = "EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz"; + sha512 = "MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw=="; }; }; "fs-mkdirp-stream-1.0.0" = { @@ -35640,13 +35127,13 @@ let sha512 = "xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw=="; }; }; - "fswin-3.22.106" = { + "fswin-3.23.119" = { name = "fswin"; packageName = "fswin"; - version = "3.22.106"; + version = "3.23.119"; src = fetchurl { - url = "https://registry.npmjs.org/fswin/-/fswin-3.22.106.tgz"; - sha512 = "j/fa7L2fiwEZkyLHRVecd2d5iZAvFUIS8VcvqaSN1SQe5WlL9xfQT4wZFUl8YafH9vTGZlNohJyI3p/Hrtu1WQ=="; + url = "https://registry.npmjs.org/fswin/-/fswin-3.23.119.tgz"; + sha512 = "OzyPAua0GO/ii2z+uB2IdqU+5rvWJy1dX6/K0PQm82tPl/gh59Js84RArk06TxpPq7/WiHOpM56Fo8UnphPhow=="; }; }; "ftp-0.3.10" = { @@ -37144,13 +36631,13 @@ let sha512 = "1M0NG5VDIvJZEnstHbRdckLZESoJwguinwN8Dhae0j2ZKIQFIV63zxm6Fo6nM4xkgqUr2bbMtV5Dgo+Hy6oo0Q=="; }; }; - "google-gax-3.5.2" = { + "google-gax-3.5.6" = { name = "google-gax"; packageName = "google-gax"; - version = "3.5.2"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-3.5.2.tgz"; - sha512 = "AyP53w0gHcWlzxm+jSgqCR3Xu4Ld7EpSjhtNBnNhzwwWaIUyphH9kBGNIEH+i4UGkTUXOY29K/Re8EiAvkBRGw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-3.5.6.tgz"; + sha512 = "gw1phnFuVB8Vtad/An9/4cLfhjNCj4FqyqDA0W09r/ZUWe70VZFZ7SNrvQNX81iLoOEjfTPHKEGZL/anuFxU5w=="; }; }; "google-p12-pem-3.1.4" = { @@ -37522,13 +37009,13 @@ let sha512 = "Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg=="; }; }; - "graphql-config-4.4.0" = { + "graphql-config-4.4.1" = { name = "graphql-config"; packageName = "graphql-config"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.4.0.tgz"; - sha512 = "QUrX7R4htnTBTi83a0IlIilWVfiLEG8ANFlHRcxoZiTvOXTbgan67SUdGe1OlopbDuyNgtcy4ladl3Gvk4C36A=="; + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.4.1.tgz"; + sha512 = "B8wlvfBHZ5WnI4IiuQZRqql6s+CKz7S+xpUeTb28Z8nRBi8tH9ChEBgT5FnTyE05PUhHlrS2jK9ICJ4YBl9OtQ=="; }; }; "graphql-language-service-5.1.1" = { @@ -37639,13 +37126,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.11.2" = { + "graphql-ws-5.11.3" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.11.2"; + version = "5.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.11.2.tgz"; - sha512 = "4EiZ3/UXYcjm+xFGP544/yW1+DVI8ZpKASFbzrV5EDTFWJp0ZvLl4Dy2fSZAzz9imKp5pZMIcjB0x/H69Pv/6w=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.11.3.tgz"; + sha512 = "fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ=="; }; }; "gray-matter-4.0.3" = { @@ -40105,13 +39592,13 @@ let sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="; }; }; - "immutable-4.2.2" = { + "immutable-4.2.3" = { name = "immutable"; packageName = "immutable"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz"; - sha512 = "fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.2.3.tgz"; + sha512 = "IHpmvaOIX4VLJwPOuQr1NpeBr2ZG6vpIj3blsLVxXRWJscLioaJRStqC+NcBsLeCDsnGlPpXd5/WZmnE7MbsKA=="; }; }; "import-cwd-2.1.0" = { @@ -43282,13 +42769,13 @@ let sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; - "jimp-0.16.2" = { + "jimp-0.16.13" = { name = "jimp"; packageName = "jimp"; - version = "0.16.2"; + version = "0.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/jimp/-/jimp-0.16.2.tgz"; - sha512 = "UpItBk81a92f8oEyoGYbO3YK4QcM0hoIyuGHmShoF9Ov63P5Qo7Q/X2xsAgnODmSuDJFOtrPtJd5GSWW4LKdOQ=="; + url = "https://registry.npmjs.org/jimp/-/jimp-0.16.13.tgz"; + sha512 = "Bxz8q7V4rnCky9A0ktTNGA9SkNFVWRHodddI/DaAWZJzF7sVUlFYKQ60y9JGqrKpi48ECA/TnfMzzc5C70VByA=="; }; }; "jimp-compact-0.16.1" = { @@ -43760,6 +43247,15 @@ let sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; }; + "jsdoc-4.0.0" = { + name = "jsdoc"; + packageName = "jsdoc"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz"; + sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; + }; + }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -43841,49 +43337,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.73.0" = { + "jsii-1.74.0" = { name = "jsii"; packageName = "jsii"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.73.0.tgz"; - sha512 = "6GLXJv+XDPNPw4JRAMr6NicWgLorFcKmAZB6x+gqCnrkA6FqZlgDPohFdcqAkxE5Px9K3oAFIsnEH/xV3HuGrg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.74.0.tgz"; + sha512 = "Y2Y3U2kYOn7yRYD4UrMyq3pJNGIKebEWsjbFjsYiCm+LNqdq9beAh+Ayv7NA4mACSJbWNqTcT/VH7qZMIVBsww=="; }; }; - "jsii-pacmak-1.73.0" = { + "jsii-pacmak-1.74.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.73.0.tgz"; - sha512 = "zz3z+AoKXciKxBcmFt4PHPQPhbkjRUgN0hkrC6XhqugbpGprICtLNimU4qAQywHA+T0024TX8fnCCuymQ1sJPg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.74.0.tgz"; + sha512 = "se/HUWjCsaXFGI1K/EGDOHtWbETn4iwm14SuK6LFj5CQu7ZX/aHTBCGFWA3qUwttXaDaBNatmuNQUYSydvKeaA=="; }; }; - "jsii-reflect-1.73.0" = { + "jsii-reflect-1.74.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.73.0.tgz"; - sha512 = "RNnejItM5DUvTpMNBhL095Yt87a6mLWTse9rYZmR+XglJ8WdyNW8mmDftz8gq58TKr5mDVUtq5vpRApCEm0Viw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.74.0.tgz"; + sha512 = "/yt04q5pfnwZZtiHkXxg3svJYI3U77uhbCE/sdcVDoCsRLJhpsI2k+7Py0wls+YXhs6V50jIesw8/YAatfGveg=="; }; }; - "jsii-rosetta-1.73.0" = { + "jsii-rosetta-1.74.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.73.0.tgz"; - sha512 = "UrXBaM/7jJldrlDN2aV/vaIurIZJM4ikJtcE/ugSoAuJUW42Hpi0Qd5k9MiSaE/k+KNxRpihS+skRa2TETT3Cg=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.74.0.tgz"; + sha512 = "dP3c0oJ8XYNKq/OC1v7algTPLXcd9VmhiGQOwVs4R6U9xfo82A3JQ675u3vXXFqBt3OwRXCDL4L9Kk5IwrteyQ=="; }; }; - "jsii-srcmak-0.1.807" = { + "jsii-srcmak-0.1.815" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.807"; + version = "0.1.815"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.807.tgz"; - sha512 = "K4Sri59N7ckh1jSxjdEG386xmJERx4uJgN2CszTA/w8EFMe9cg1xcTgOKyue2Q674xlhNhQleC1ON0wUv/bu7A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.815.tgz"; + sha512 = "O+U6Lyh34Ns6BL/Ai29V2guHgOKtFOBwdPWOX6LxpW6EjICYxGlhydoB6BjkVdIZOhETbLndw3xOJkAORwXmqA=="; }; }; "json-bigint-1.0.0" = { @@ -44174,6 +43670,15 @@ let sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; }; }; + "json-schema-typed-8.0.1" = { + name = "json-schema-typed"; + packageName = "json-schema-typed"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.1.tgz"; + sha512 = "XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg=="; + }; + }; "json-server-0.8.23" = { name = "json-server"; packageName = "json-server"; @@ -44246,13 +43751,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.3.257" = { + "json2jsii-0.3.266" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.257"; + version = "0.3.266"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.257.tgz"; - sha512 = "viB1ukEAISc2TQS2uSmyrwLm8TS/zyAhsXwSj2nNC4UU43F+j7MK0SqloosTPiJVGBgB+3iSUDaMy5Rb5BV34g=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.266.tgz"; + sha512 = "ABEMfbdQuL0oa6Bf0alz2GhlmdYnhQ7MV8VYzxwOjEiJvLgHLjD4ORmVhOhpI9YPbsX8E9drgm3S8tunSNcpJg=="; }; }; "json3-3.2.6" = { @@ -48576,13 +48081,13 @@ let sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; }; }; - "make-fetch-happen-11.0.2" = { + "make-fetch-happen-11.0.3" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz"; - sha512 = "5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz"; + sha512 = "oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA=="; }; }; "make-fetch-happen-9.1.0" = { @@ -49305,13 +48810,13 @@ let sha512 = "NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ=="; }; }; - "mdast-util-gfm-2.0.1" = { + "mdast-util-gfm-2.0.2" = { name = "mdast-util-gfm"; packageName = "mdast-util-gfm"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz"; - sha512 = "42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ=="; + url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.2.tgz"; + sha512 = "qvZ608nBppZ4icQlhQQIAdc6S3Ffj9RGmzwUKUWuEICFnd1LVkN3EktF7ZHAgfcEdvZB5owU9tQgt99e2TlLjg=="; }; }; "mdast-util-gfm-autolink-literal-0.1.3" = { @@ -49323,13 +48828,13 @@ let sha512 = "GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A=="; }; }; - "mdast-util-gfm-autolink-literal-1.0.2" = { + "mdast-util-gfm-autolink-literal-1.0.3" = { name = "mdast-util-gfm-autolink-literal"; packageName = "mdast-util-gfm-autolink-literal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz"; - sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; + url = "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.3.tgz"; + sha512 = "My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA=="; }; }; "mdast-util-gfm-footnote-1.0.2" = { @@ -49350,13 +48855,13 @@ let sha512 = "5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA=="; }; }; - "mdast-util-gfm-strikethrough-1.0.2" = { + "mdast-util-gfm-strikethrough-1.0.3" = { name = "mdast-util-gfm-strikethrough"; packageName = "mdast-util-gfm-strikethrough"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.2.tgz"; - sha512 = "T/4DVHXcujH6jx1yqpcAYYwd+z5lAYMw4Ls6yhTfbMMtCt0PHY4gEfhW9+lKsLBtyhUGKRIzcUA2FATVqnvPDA=="; + url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.3.tgz"; + sha512 = "DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ=="; }; }; "mdast-util-gfm-table-0.1.6" = { @@ -49368,13 +48873,13 @@ let sha512 = "j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ=="; }; }; - "mdast-util-gfm-table-1.0.6" = { + "mdast-util-gfm-table-1.0.7" = { name = "mdast-util-gfm-table"; packageName = "mdast-util-gfm-table"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz"; - sha512 = "uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag=="; + url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.7.tgz"; + sha512 = "jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg=="; }; }; "mdast-util-gfm-task-list-item-0.1.6" = { @@ -49404,40 +48909,40 @@ let sha512 = "8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw=="; }; }; - "mdast-util-mdx-2.0.0" = { + "mdast-util-mdx-2.0.1" = { name = "mdast-util-mdx"; packageName = "mdast-util-mdx"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-2.0.0.tgz"; - sha512 = "M09lW0CcBT1VrJUaF/PYxemxxHa7SLDHdSn94Q9FhxjCQfuW7nMAWKWimTmA3OyDMSTH981NN1csW1X+HPSluw=="; + url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-2.0.1.tgz"; + sha512 = "38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw=="; }; }; - "mdast-util-mdx-expression-1.3.1" = { + "mdast-util-mdx-expression-1.3.2" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.1.tgz"; - sha512 = "TTb6cKyTA1RD+1su1iStZ5PAv3rFfOUKcoU5EstUpv/IZo63uDX03R8+jXjMEhcobXnNOiG6/ccekvVl4eV1zQ=="; + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.2.tgz"; + sha512 = "xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA=="; }; }; - "mdast-util-mdx-jsx-2.1.0" = { + "mdast-util-mdx-jsx-2.1.1" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.0.tgz"; - sha512 = "KzgzfWMhdteDkrY4mQtyvTU5bc/W4ppxhe9SzelO6QUUiwLAM+Et2Dnjjprik74a336kHdo0zKm7Tp+n6FFeRg=="; + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.1.tgz"; + sha512 = "dV398twlcAKiqQfj3BkC4PWinVlG1YSL/qs71M7z8xmSksqp3lATH+qrmWUJBOIjOYcD5xuIu6k1ld2btB3EqQ=="; }; }; - "mdast-util-mdxjs-esm-1.3.0" = { + "mdast-util-mdxjs-esm-1.3.1" = { name = "mdast-util-mdxjs-esm"; packageName = "mdast-util-mdxjs-esm"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.0.tgz"; - sha512 = "7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g=="; + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.1.tgz"; + sha512 = "SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w=="; }; }; "mdast-util-phrasing-3.0.1" = { @@ -51051,13 +50556,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.0" = { + "minipass-4.0.2" = { name = "minipass"; packageName = "minipass"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.2.tgz"; + sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A=="; }; }; "minipass-collect-1.0.2" = { @@ -51717,22 +51222,22 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.8.2" = { + "msgpackr-1.8.3" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; - sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; + sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; }; }; - "msgpackr-extract-2.2.0" = { + "msgpackr-extract-3.0.0" = { name = "msgpackr-extract"; packageName = "msgpackr-extract"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"; - sha512 = "0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog=="; + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.0.tgz"; + sha512 = "oy6KCk1+X4Bn5m6Ycq5N1EWl9npqG/cLrE8ga8NX7ZqfqYUUBS08beCQaGq80fjbKBySur0E6x//yZjzNJDt3A=="; }; }; "mssql-9.1.1" = { @@ -52104,13 +51609,13 @@ let sha512 = "Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig=="; }; }; - "mysql2-3.0.1" = { + "mysql2-3.1.0" = { name = "mysql2"; packageName = "mysql2"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-3.0.1.tgz"; - sha512 = "Wrh5KuE0OOlm6wRwRhE2q+C8LjwwfT3sFKVauyTwMwPbOd2i0SzxMqTZPqs90ZNAEWjot5GFywje84qVn3ITYw=="; + url = "https://registry.npmjs.org/mysql2/-/mysql2-3.1.0.tgz"; + sha512 = "woMeIog21X72RcFLhE/xajhUdnwRMd6Oq16S7/O2qJ5lPUDfFwgSW+xhx7TjzcM8PU3q+dVsryIaDi+HyQR/0A=="; }; }; "mz-2.7.0" = { @@ -53149,13 +52654,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-2.6.8" = { + "node-fetch-2.6.9" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; }; }; "node-fetch-3.2.10" = { @@ -53302,6 +52807,15 @@ let sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA=="; }; }; + "node-gyp-build-optional-packages-5.0.7" = { + name = "node-gyp-build-optional-packages"; + packageName = "node-gyp-build-optional-packages"; + version = "5.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz"; + sha512 = "YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w=="; + }; + }; "node-hid-2.1.2" = { name = "node-hid"; packageName = "node-hid"; @@ -53464,13 +52978,22 @@ let sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; - "node-releases-2.0.8" = { + "node-releases-2.0.10" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"; - sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"; + sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="; + }; + }; + "node-releases-2.0.9" = { + name = "node-releases"; + packageName = "node-releases"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz"; + sha512 = "2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA=="; }; }; "node-rsa-1.1.1" = { @@ -55220,13 +54743,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.73.0" = { + "oo-ascii-tree-1.74.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.73.0.tgz"; - sha512 = "bGx23QLCltdo+jrUcvnxf+2Ob7Ntsr8n7UzHPVoz0pWABSjzIzxOh2GRQa/2GebYNTqIHLnERY5Ubs/V7RVPWg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.74.0.tgz"; + sha512 = "tV5BBZhFvALFKY/DMVILN5jDznPRZte0Yoj1hPmbAVGL4VSpsEXx0ZrP8fnFZKbAOyCwWq+PV26n7S5+cP86Xw=="; }; }; "open-0.0.2" = { @@ -55922,24 +55445,6 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.6.1" = { - name = "ot-builder"; - packageName = "ot-builder"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.6.1.tgz"; - sha512 = "08u12lm5A2S9c16/QTHs/ZvsZhQQe8BQEkSdU1D/u9gpKccBV1jadJNJHXfkZA7N/Y1Yn0dlh274J35YHX1RNQ=="; - }; - }; - "otb-ttc-bundle-1.6.1" = { - name = "otb-ttc-bundle"; - packageName = "otb-ttc-bundle"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.6.1.tgz"; - sha512 = "UN/85A4UWU6w1fkzpLwN60nh6bxCcg8E8gtz+yhOmjOQEhZ8g40rQG2mqqoy7Dubkc1kzsehtzCjKrhzp+YWLA=="; - }; - }; "ow-0.21.0" = { name = "ow"; packageName = "ow"; @@ -56633,6 +56138,15 @@ let sha512 = "OhwWeWAFnklitYkobAgIqM7UlQuJdsYI9WeEsfdiVrfJau02JYwljtNMZEID1XWE7sYW3vMD3H8tsJC+fagrPQ=="; }; }; + "paid-services-4.3.3" = { + name = "paid-services"; + packageName = "paid-services"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.3.tgz"; + sha512 = "OfYQkRAne2HbPsC+tWjwfQVAbjzq7mBXVQF1aGwfbpWEO49X54aH0/RwepQjkxrRvYFMqHc++NGxcHwQRRWTew=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -60674,31 +60188,22 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.1.2" = { + "protobufjs-7.2.1" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz"; - sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz"; + sha512 = "L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA=="; }; }; - "protobufjs-7.2.0" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; - sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; - }; - }; - "protobufjs-cli-1.0.2" = { + "protobufjs-cli-1.1.1" = { name = "protobufjs-cli"; packageName = "protobufjs-cli"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.0.2.tgz"; - sha512 = "cz9Pq9p/Zs7okc6avH20W7QuyjTclwJPgqXG11jNaulfS3nbVisID8rC+prfgq0gbZE0w9LBFd1OKFF03kgFzg=="; + url = "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz"; + sha512 = "VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA=="; }; }; "protocol-buffers-encodings-1.2.0" = { @@ -61727,22 +61232,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.6.2" = { + "puppeteer-19.6.3" = { name = "puppeteer"; packageName = "puppeteer"; - version = "19.6.2"; + version = "19.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.6.2.tgz"; - sha512 = "Y5OAXXwXLfJYbl0dEFg8JKIhvCGxn+UYaBW9yra9ErmIhkVroDnYusM6oYxJCt/YIfC2pQWhvhxoZyf/E5fV6w=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.6.3.tgz"; + sha512 = "K03xTtGDwS6cBXX/EoqoZxglCUKcX2SLIl92fMnGMRjYpPGXoAV2yKEh3QXmXzKqfZXd8TxjjFww+tEttWv8kw=="; }; }; - "puppeteer-core-19.6.2" = { + "puppeteer-core-19.6.3" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "19.6.2"; + version = "19.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.6.2.tgz"; - sha512 = "il7uK658MNC1FlxPABvcnv1RdpDa9CaBFHzvtEsl+9Y4tbAJKZurkegpcvWeIWcRYGiuBIVo+t+ZSh3G82CCjw=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.6.3.tgz"; + sha512 = "8MbhioSlkDaHkmolpQf9Z7ui7jplFfOFTnN8d5kPsCazRRTNIH6/bVxPskn0v5Gh9oqOBlknw0eHH0/OBQAxpQ=="; }; }; "purgecss-2.3.0" = { @@ -61817,13 +61322,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.291" = { + "pyright-1.1.292" = { name = "pyright"; packageName = "pyright"; - version = "1.1.291"; + version = "1.1.292"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; - sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.292.tgz"; + sha512 = "qwNT2mBKiZXSzVckHkyuCoyrKa8CXh6o4xH7PL/+jeIdiv+a5ljfkxPvIEm6Stln8YEU/tnQb8xODUtgKsu5YA=="; }; }; "q-0.9.7" = { @@ -62231,31 +61736,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-21.0.4" = { + "quicktype-core-21.0.9" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "21.0.4"; + version = "21.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-21.0.4.tgz"; - sha512 = "JJiJ8dzBTh/l/gTNnVwKFx0g2A0CfLNzXlUxTHjdvyldXi/Jjckr+Z04calGXxlG8KunpE4G5vV+EtuFjoTIPQ=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-21.0.9.tgz"; + sha512 = "lXLJdo00KMSXaWOH49vDLGyfIEiqu9leevyNyYxNYvhCpPMon6zaAqXHIc1V3ByRN4ErCUkpsnzruuIQ3+OeKQ=="; }; }; - "quicktype-graphql-input-21.0.4" = { + "quicktype-graphql-input-21.0.9" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "21.0.4"; + version = "21.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-21.0.4.tgz"; - sha512 = "WXHcXL2d2HLfihbJBsJvBhzDc8sAkR5cNF6Y36R9p1eY3b0PKKmdbdHSFif/SkW9HAVP0DyP8/6rskFLU5Z9KA=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-21.0.9.tgz"; + sha512 = "46dCbA2QzHbTcQvfH/XJhDPo39EWKro2rjVh8JgKSoaUe2NRVsK8aVwZracPaJTrRoeAbx14XZjrQxTYeE2a1g=="; }; }; - "quicktype-typescript-input-21.0.4" = { + "quicktype-typescript-input-21.0.9" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "21.0.4"; + version = "21.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-21.0.4.tgz"; - sha512 = "Lc0dwFZUk+dRL95sjb2iNS92GsvuwVaXQQyPJ5y4RPXm15ASTdSE3U8U94ySy2QwhNOnsv23WkkCyrxDdvk0sg=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-21.0.9.tgz"; + sha512 = "cFABkgV0odHemCtaHKw8ZTbYnpbj6yuwUtoOaMEKgNrqFeRMdv5uh2qnOj49OTUuCZOVY1WZUz9kTdF6SHR2yQ=="; }; }; "quotation-1.1.3" = { @@ -63491,13 +62996,13 @@ let sha512 = "bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ=="; }; }; - "redis-4.6.2" = { + "redis-4.6.4" = { name = "redis"; packageName = "redis"; - version = "4.6.2"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.2.tgz"; - sha512 = "Xoh7UyU6YnT458xA8svaZAJu6ZunKeW7Z/7GXrLWGGwhVLTsDX6pr3u7ENAoV+DHBPO+9LwIu45ClwUwpIjAxw=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.4.tgz"; + sha512 = "wi2tgDdQ+Q8q+PR5FLRx4QvDiWaA+PoJbrzsyFqlClN5R4LplHqN3scs/aGjE//mbz++W19SgxiEnQ27jnCRaA=="; }; }; "redis-commands-1.7.0" = { @@ -64823,13 +64328,13 @@ let sha512 = "3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg=="; }; }; - "request-light-0.6.0" = { + "request-light-0.7.0" = { name = "request-light"; packageName = "request-light"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/request-light/-/request-light-0.6.0.tgz"; - sha512 = "D3TyWnzX4Kej7ZomWbD+ZqnmzKw/otLHU4tsuhsnF3CoIBo9y0JsxkQXGAqBC4FH/y1hm/ry0/hrsVaKMCkljA=="; + url = "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz"; + sha512 = "lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="; }; }; "request-oauth-0.0.3" = { @@ -66227,13 +65732,13 @@ let sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; }; }; - "sass-1.57.1" = { + "sass-1.58.0" = { name = "sass"; packageName = "sass"; - version = "1.57.1"; + version = "1.58.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; - sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz"; + sha512 = "PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg=="; }; }; "sass-formatter-0.7.5" = { @@ -67289,13 +66794,13 @@ let sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; }; - "shell-quote-1.7.4" = { + "shell-quote-1.8.0" = { name = "shell-quote"; packageName = "shell-quote"; - version = "1.7.4"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz"; - sha512 = "8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw=="; + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz"; + sha512 = "QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ=="; }; }; "shelljs-0.7.8" = { @@ -68909,15 +68414,6 @@ let sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA=="; }; }; - "spiro-3.0.0" = { - name = "spiro"; - packageName = "spiro"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spiro/-/spiro-3.0.0.tgz"; - sha512 = "UEhtLWA8fDQuExOKpT3FLa7Rk238G5Bm3wGAxbvnah3H2X6yEL4blIkAsc38wNwMXBwQFRYE6l0Q9X0t1izOxA=="; - }; - }; "split-0.2.10" = { name = "split"; packageName = "split"; @@ -71070,6 +70566,15 @@ let sha512 = "qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA=="; }; }; + "stubborn-fs-1.2.1" = { + name = "stubborn-fs"; + packageName = "stubborn-fs"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.1.tgz"; + sha512 = "IgTveO0OGXMMi9iZtfPoYQY6IpeZR3ILtSsjMapFgLxofWaHG1sNlInV7yTRDV06YiNdwiKrK7505Fxq8ly+YA=="; + }; + }; "style-loader-0.23.1" = { name = "style-loader"; packageName = "style-loader"; @@ -71547,13 +71052,13 @@ let sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; - "svelte2tsx-0.6.0" = { + "svelte2tsx-0.6.1" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.0.tgz"; - sha512 = "TrxfQkO7CKi8Pu2eC/FyteDCdk3OOeQV5u6z7OjYAsOhsd0ClzAKqxJdvp6xxNQLrbFzf/XvCi9Fy8MQ1MleFA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.1.tgz"; + sha512 = "O/1+5UyChfmhp1/GUv8b8iveTrn6eZwHxEXc+rw7LMKRidr9KHk5w/EiliLjDUwHa2VA6CoEty+CQylROVU4Sw=="; }; }; "sver-compat-1.5.0" = { @@ -71844,13 +71349,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.17.4" = { + "systeminformation-5.17.8" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.17.4"; + version = "5.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.4.tgz"; - sha512 = "mEiIYrw7X5ABX8tJUgzbumQAuFQxNyHdZDz6+UtwNKUbKgIoZqLtug2z1spFB/LiXZne5tdPBJOlvVckbvfhiQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.8.tgz"; + sha512 = "kMQsCOFQXqEjoDWKpYkC+ezJImrOnyTL3FZnYDZdWLTZcMW7Gomdp8zH9ztGlSo2L1iCAQXZ8HlV1bI8/Ts64g=="; }; }; "sywac-1.3.0" = { @@ -72385,13 +71890,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.16.1" = { + "terser-5.16.3" = { name = "terser"; packageName = "terser"; - version = "5.16.1"; + version = "5.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; - sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz"; + sha512 = "v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -72484,13 +71989,13 @@ let sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw=="; }; }; - "textlint-13.0.4" = { + "textlint-13.1.4" = { name = "textlint"; packageName = "textlint"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; - sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.1.4.tgz"; + sha512 = "/+CkTaqQWSzBRBGtZDxpjmFsOo9fYtswW8RNrUnK7piQ+6MDFQ4+wydh5hzCRQi1L5L2gRmj+uOALFqn7LuhDg=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -72520,13 +72025,13 @@ let sha512 = "4O8hrXNb0BUePg+yvueWdR+ViXC8R7RgUcmo+56iU28pgqcrAjSEpz2YGpbsSF54wlyxJuP4v98whgjlEJtCmw=="; }; }; - "textlint-util-to-string-3.1.1" = { + "textlint-util-to-string-3.2.0" = { name = "textlint-util-to-string"; packageName = "textlint-util-to-string"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-3.1.1.tgz"; - sha512 = "mHE7/pDw/Hk+Q6YdSMNRrZPl5bCuWnFLbF+bxW+MsWQ64dw+Ia9irkammYbH5I0hVMMcfwb0MQc5nbsjqgWeyQ=="; + url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-3.2.0.tgz"; + sha512 = "u3mdhqYQI0c1p2ICYwQwA2RpzCJjPmhk5DvgvOO5NSAmfj+zBwSXV//HIE1y8M7UauRdewcQ672WWE6SiRi/zQ=="; }; }; "tfunk-4.0.0" = { @@ -72988,13 +72493,13 @@ let sha512 = "+CorETse1kl98xg0WAzii8DTT4ABF4R3nquhrkIbVGcw1T8JYs5Gfx9xEfGINPUZGDj9C4BmOtuKeaTtuuRolg=="; }; }; - "tinycolor2-1.5.2" = { + "tinycolor2-1.6.0" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; - sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz"; + sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; }; }; "titleize-2.1.0" = { @@ -73042,22 +72547,22 @@ let sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; - "tldts-5.7.104" = { + "tldts-5.7.105" = { name = "tldts"; packageName = "tldts"; - version = "5.7.104"; + version = "5.7.105"; src = fetchurl { - url = "https://registry.npmjs.org/tldts/-/tldts-5.7.104.tgz"; - sha512 = "PlziEIVPH/ogbqOhS35K6MOeD09rd9U5g2NHO5n9NZeMC1PGpXgsjQpoJ1KiRnjhZsWDkzN8EoX3xQZuz5ZyFQ=="; + url = "https://registry.npmjs.org/tldts/-/tldts-5.7.105.tgz"; + sha512 = "wWtgT+NT+o8LLN7DflfWGJM2/wJ8haPg0maLYseYVy+evWuuBQAThNnVen9GFEaUGMUp8EHFONEx6kHCsSiveA=="; }; }; - "tldts-core-5.7.104" = { + "tldts-core-5.7.105" = { name = "tldts-core"; packageName = "tldts-core"; - version = "5.7.104"; + version = "5.7.105"; src = fetchurl { - url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.104.tgz"; - sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; + url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.105.tgz"; + sha512 = "YcUuyM4LWdG/Ai3L53MZkajkZ0NlL3LmvOtN2eUnMsYlPXcIqzSFhUG43IM7fj062djVy2tdJFN+Ls52hsp+Bg=="; }; }; "tmp-0.0.29" = { @@ -73393,15 +72898,6 @@ let sha512 = "FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg=="; }; }; - "toposort-2.0.2" = { - name = "toposort"; - packageName = "toposort"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; - }; - }; "torrent-discovery-5.4.0" = { name = "torrent-discovery"; packageName = "torrent-discovery"; @@ -73969,15 +73465,6 @@ let sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; }; }; - "tsconfig-paths-4.1.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.1.tgz"; - sha512 = "VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q=="; - }; - }; "tsconfig-paths-4.1.2" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; @@ -74491,13 +73978,13 @@ let sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; }; }; - "type-fest-3.5.3" = { + "type-fest-3.5.5" = { name = "type-fest"; packageName = "type-fest"; - version = "3.5.3"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.3.tgz"; - sha512 = "V2+og4j/rWReWvaFrse3s9g2xvUv/K9Azm/xo6CjIuq7oeGqsoimC7+9/A3tfvNcbQf8RPSVj/HV81fB4DJrjA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.5.tgz"; + sha512 = "Nudle2CLcCaf9/1bVQunwzX1/ZH4Z6mvP8hkWWZCbKrxtnN52QwD5Xn/mo68aofQhGU4be1GlEC6LQCTKGXkRw=="; }; }; "type-is-1.6.18" = { @@ -74671,6 +74158,15 @@ let sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; }; }; + "typescript-4.9.5" = { + name = "typescript"; + packageName = "typescript"; + version = "4.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -74743,15 +74239,6 @@ let sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; }; }; - "typo-geom-0.13.0" = { - name = "typo-geom"; - packageName = "typo-geom"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.13.0.tgz"; - sha512 = "s7BV1wSA+kcv2kNjJXrXgl9By8BGqwRu1llbxfkv45McR/ZyxWOFXUgTMUZdUFn79UQuVc0yzKisrj8XzkR27A=="; - }; - }; "u2f-api-0.2.7" = { name = "u2f-api"; packageName = "u2f-api"; @@ -75148,15 +74635,6 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.16.0" = { - name = "undici"; - packageName = "undici"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.16.0.tgz"; - sha512 = "KWBOXNv6VX+oJQhchXieUznEmnJMqgXMbs0xxH2t8q/FUAWSJvOSr/rMaZKnX5RIVq7JDn0JbP4BOnKG2SGXLQ=="; - }; - }; "undici-5.9.1" = { name = "undici"; packageName = "undici"; @@ -76966,13 +76444,13 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; - "validator-13.7.0" = { + "validator-13.9.0" = { name = "validator"; packageName = "validator"; - version = "13.7.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz"; - sha512 = "nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="; + url = "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz"; + sha512 = "B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA=="; }; }; "validator-5.7.0" = { @@ -77596,13 +77074,13 @@ let sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; }; }; - "vfile-reporter-7.0.4" = { + "vfile-reporter-7.0.5" = { name = "vfile-reporter"; packageName = "vfile-reporter"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz"; - sha512 = "4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A=="; + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz"; + sha512 = "NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw=="; }; }; "vfile-reporter-pretty-5.0.0" = { @@ -77767,13 +77245,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.13" = { + "vm2-3.9.14" = { name = "vm2"; packageName = "vm2"; - version = "3.9.13"; + version = "3.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; - sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; + sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; }; }; "voc-1.2.0" = { @@ -77893,13 +77371,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.1.4" = { + "vscode-json-languageservice-5.2.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.1.4"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.4.tgz"; - sha512 = "ROZ1ezYQUbq9b/07xYpHtZSyyhoUk3oTTGVAEr6bU1DKr8ELaz9fsDoHno34tKtHj/Tf3deQqfjQNGKdbRuvTw=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.2.0.tgz"; + sha512 = "q8Rdhu2HEddRxvlhVqwh0cWmKK+OtyMB2xRhtqXEQ7cjb0iZ14madb90iJe9fCHPjoj9CGBrq6QzuOp8OE6XWg=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -78289,13 +77767,13 @@ let sha512 = "D4rUfu/oKYdc9Tmec0nEfedj+uXO2tZHR+eoHs9rE9G/QpRyZaHuug8ZUNGTGdO+ALLGgenL6bRpY8y3J9acHg=="; }; }; - "vscode-markdown-languageservice-0.2.0" = { + "vscode-markdown-languageservice-0.3.0-alpha.4" = { name = "vscode-markdown-languageservice"; packageName = "vscode-markdown-languageservice"; - version = "0.2.0"; + version = "0.3.0-alpha.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0.tgz"; - sha512 = "3Jh7/eN6zEPqfkT6cjL+AwGoQ7euL8RtW3FYf24IfPksz4nAZJcRibRtpSdlCaOKpwEoy/f5Axh94cmWPIGBMw=="; + url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.4.tgz"; + sha512 = "wMstTLuX3F+BkjxXCY4d1xKzHyBTHTC2EECg701FpBbSppa17Zj/Hk2G9H1dZGXhQeexXifxVXKScbLD6cB/3g=="; }; }; "vscode-nls-2.0.2" = { @@ -78667,13 +78145,13 @@ let sha512 = "rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w=="; }; }; - "wasm-feature-detect-1.4.0" = { + "wasm-feature-detect-1.5.0" = { name = "wasm-feature-detect"; packageName = "wasm-feature-detect"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.4.0.tgz"; - sha512 = "9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw=="; + url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.5.0.tgz"; + sha512 = "Wxw7de5ouYoFJsWXJdexwy8WU+8/LGUp4bFWS/1FlVzBUin0Yjko75772MFJdwf91N+MBZKINoOgsxw0UWKlRQ=="; }; }; "watchpack-1.7.5" = { @@ -78721,15 +78199,6 @@ let sha512 = "+6w4AvzsD+yHVP/mEYzn2sQ1VKn0UZNEt4QeO4X74cxEt8NhZOB+fxfHrUkbArfyC32AhhbTd5ZtD8RtBChA0Q=="; }; }; - "wawoff2-2.0.1" = { - name = "wawoff2"; - packageName = "wawoff2"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz"; - sha512 = "r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA=="; - }; - }; "wbuf-1.7.3" = { name = "wbuf"; packageName = "wbuf"; @@ -78820,15 +78289,6 @@ let sha512 = "e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="; }; }; - "web-streams-polyfill-4.0.0-beta.3" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "4.0.0-beta.3"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz"; - sha512 = "QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug=="; - }; - }; "web-tree-sitter-0.20.5" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -78856,13 +78316,13 @@ let sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; }; }; - "web3-utils-1.8.1" = { + "web3-utils-1.8.2" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.8.1.tgz"; - sha512 = "LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.8.2.tgz"; + sha512 = "v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA=="; }; }; "webassemblyjs-1.11.1" = { @@ -79333,6 +78793,15 @@ let sha512 = "9lFZp/KHoqH6bPKjbWqa+3Dg/K/r2v0X/3/G2x4DBGchVS2QX2VXL3cZV994WQVnTM1/PD71Az25nAzryEUugw=="; }; }; + "when-exit-2.0.0" = { + name = "when-exit"; + packageName = "when-exit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/when-exit/-/when-exit-2.0.0.tgz"; + sha512 = "17lB0PWIgOuil9dgC/vdQY0aq5lwT0umemaIsOTNDBsc1TwclvocXOvkwenwUXEawN5mW3F64X52xPkTFnihDw=="; + }; + }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -80729,13 +80198,13 @@ let sha512 = "F6WF5s6xG/bm8Oxi2ETuzwGQW8yleL5I4JPxZl49m7Uw7D4LAXu+4dvUK78Uo4D863sM8auqw6+1Xmj9mFlmDQ=="; }; }; - "xstate-4.35.3" = { + "xstate-4.35.4" = { name = "xstate"; packageName = "xstate"; - version = "4.35.3"; + version = "4.35.4"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.35.3.tgz"; - sha512 = "/vM8la6OPcmT2P4R8p37P/Pzo8fTeEjvg+lxCfQ7vTeJg6NmzPHDJ5RdlrGfojEIabMxKW22Tm2kz8oV390Awg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.35.4.tgz"; + sha512 = "mqRBYHhljP1xIItI4xnSQNHEv6CKslSM1cOGmvhmxeoDPAZgNbhSUYAL5N6DZIxRfpYY+M+bSm3mUFHD63iuvg=="; }; }; "xstream-11.14.0" = { @@ -81512,13 +80981,13 @@ let sha512 = "1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ=="; }; }; - "zwave-js-10.5.4" = { + "zwave-js-10.7.0" = { name = "zwave-js"; packageName = "zwave-js"; - version = "10.5.4"; + version = "10.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.5.4.tgz"; - sha512 = "Zo2aSYLYKLUca0Wxp7m1Ju83CZeAvJorKjww9MkIvR85hqi/I5QZCC0nXQ2sQb3q0171tGndtICdfsuAE7dfRg=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.7.0.tgz"; + sha512 = "m9PDphjSL3R7uyGwUOVk5ijFMLmeh9yvWT7BtL4JgM1yJQmFKg8dBBwDihL9U313KNCwgWzDDH7qRvWowk8/Nw=="; }; }; "zwitch-1.0.5" = { @@ -81554,15 +81023,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "15.1.3"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.3.tgz"; - sha512 = "gNVvyvkGZ1zKiDdWjPqCLst8iHcB1C4B2nXrr3B+/YAd1G/y87VI1aBKFlK9ulG4tkwktog5uQaut7xs48IsEQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.4.tgz"; + sha512 = "ebZiI4arb9wtOUMmTyUvjgDovmwpY8hmGLbkKZiEmAX8+2gbl4e97M+zd0SICZDU8bu5VcpoP6Q3Qb6vVjab9A=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1501.3" - sources."@angular-devkit/core-15.1.3" - sources."@angular-devkit/schematics-15.1.3" + sources."@angular-devkit/architect-0.1501.4" + sources."@angular-devkit/core-15.1.4" + sources."@angular-devkit/schematics-15.1.4" sources."@gar/promisify-1.1.3" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@npmcli/fs-2.1.2" @@ -81572,7 +81041,7 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.0" - sources."@schematics/angular-15.1.3" + sources."@schematics/angular-15.1.4" sources."@tootallnate/once-2.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -81640,7 +81109,7 @@ in sources."fast-deep-equal-3.1.3" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."fs-minipass-3.0.0" + sources."fs-minipass-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -81711,7 +81180,7 @@ in }) sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -81767,7 +81236,7 @@ in sources."npm-pick-manifest-8.0.1" (sources."npm-registry-fetch-14.0.3" // { dependencies = [ - sources."make-fetch-happen-11.0.2" + sources."make-fetch-happen-11.0.3" sources."minipass-fetch-3.0.1" ]; }) @@ -82313,7 +81782,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" 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.20.11" @@ -82368,14 +81837,14 @@ in sources."brace-expansion-1.1.11" sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" 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.30001449" + sources."caniuse-lite-1.0.30001450" sources."canvas-2.11.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -82411,7 +81880,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" (sources."cookies-0.8.0" // { dependencies = [ @@ -82445,7 +81914,7 @@ in ]; }) sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -82549,11 +82018,7 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -82571,7 +82036,7 @@ in sources."mute-stream-0.0.8" sources."nan-2.17.0" sources."negotiator-0.6.3" - (sources."node-fetch-2.6.8" // { + (sources."node-fetch-2.6.9" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -82580,7 +82045,7 @@ in }) sources."node-forge-1.3.1" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."nwsapi-2.2.2" @@ -82660,8 +82125,8 @@ in ]; }) sources."through-2.3.8" - sources."tldts-5.7.104" - sources."tldts-core-5.7.104" + sources."tldts-5.7.105" + sources."tldts-core-5.7.105" sources."tmp-0.0.33" sources."to-fast-properties-2.0.0" sources."toidentifier-1.0.1" @@ -82754,24 +82219,24 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" sources."acorn-8.8.2" @@ -82928,7 +82393,7 @@ in sources."trim-newlines-3.0.1" sources."ts-node-10.9.1" sources."type-fest-0.18.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -83064,7 +82529,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.20.7" @@ -83118,40 +82583,40 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" - (sources."@sentry/core-7.34.0" // { + (sources."@sentry/core-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.34.0" // { + (sources."@sentry/node-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.34.0" - (sources."@sentry/utils-7.34.0" // { + sources."@sentry/types-7.36.0" + (sources."@sentry/utils-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/html-minifier-terser-6.1.0" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/node-fetch-2.6.2" - sources."@typescript-eslint/types-5.49.0" - (sources."@typescript-eslint/typescript-estree-5.49.0" // { + sources."@typescript-eslint/types-5.50.0" + (sources."@typescript-eslint/typescript-estree-5.50.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.49.0" + sources."@typescript-eslint/visitor-keys-5.50.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -83241,7 +82706,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" @@ -83259,7 +82724,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."case-1.6.3" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -83359,7 +82824,7 @@ in ]; }) sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -83434,7 +82899,7 @@ in sources."mkdirp-0.5.6" ]; }) - sources."fswin-3.22.106" + sources."fswin-3.23.119" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" @@ -83682,7 +83147,7 @@ in ]; }) sources."node-machine-id-1.1.12" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."nth-check-2.1.1" @@ -83848,7 +83313,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.3" // { dependencies = [ sources."commander-2.20.3" ]; @@ -83906,7 +83371,7 @@ in sources."type-fest-0.21.3" sources."typed-array-length-1.0.4" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.9.4" + sources."typescript-4.9.5" (sources."typescript-json-schema-0.45.1" // { dependencies = [ sources."glob-7.2.3" @@ -84027,7 +83492,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -84188,7 +83653,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" sources."normalize-newline-4.1.0" (sources."normalize-package-data-3.0.3" // { @@ -84296,7 +83761,7 @@ in }) sources."tslib-2.5.0" sources."type-fest-0.21.3" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."url-parse-1.5.10" sources."url-template-2.0.8" @@ -84338,7 +83803,7 @@ in sha512 = "zCtMCbQxJc5k2iaB/nV+1FrGQBEfbnFh427BD7O3jR6wJjVGBIamXtVKnqYqC5Kjtam7Eb9jvusZNpRcnVcAFQ=="; }; dependencies = [ - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@medable/mdctl-api-1.0.68" sources."@medable/mdctl-api-driver-1.0.68" sources."@medable/mdctl-axon-tools-1.0.68" @@ -84373,7 +83838,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -84834,7 +84299,7 @@ in sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-abi-2.30.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-pre-gyp-0.11.0" sources."noop-fn-1.0.0" sources."noop-logger-0.1.1" @@ -85263,10 +84728,10 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.89.1"; + version = "5.90.0"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.89.1.tgz"; - sha512 = "i21mAr6U+fo7+td9zlJ9R0MA9sqbpcq8dkod0keiFJkzOJnzIb0y8yJAvr7rEzxKKZqXdfktI/8gBi+GTvdMig=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.90.0.tgz"; + sha512 = "gc8dGj/k1fpoK87EpnFi2V/DkE8DJcIYdOR3PiuOcJZfEnqWQdhKt1esk05J3shBSma4b/pXeKm8tZAoejwnhQ=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -85279,7 +84744,7 @@ in sources."tslib-2.5.0" ]; }) - (sources."@azure/core-client-1.7.0" // { + (sources."@azure/core-client-1.7.1" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -85295,12 +84760,12 @@ in sources."tslib-2.5.0" ]; }) - (sources."@azure/core-lro-2.5.0" // { + (sources."@azure/core-lro-2.5.1" // { dependencies = [ sources."tslib-2.5.0" ]; }) - (sources."@azure/core-paging-1.4.0" // { + (sources."@azure/core-paging-1.5.0" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -85359,12 +84824,12 @@ in sources."@babel/parser-7.16.4" (sources."@babel/template-7.20.7" // { dependencies = [ - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" ]; }) (sources."@babel/traverse-7.20.13" // { dependencies = [ - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" ]; }) sources."@babel/types-7.20.7" @@ -85374,7 +84839,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@microsoft/rush-lib-5.89.1" + sources."@microsoft/rush-lib-5.90.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -85395,6 +84860,7 @@ in sources."@rushstack/heft-config-file-0.11.5" (sources."@rushstack/node-core-library-3.53.3" // { dependencies = [ + sources."@types/node-12.20.24" sources."import-lazy-4.0.0" sources."resolve-1.17.0" ]; @@ -85403,13 +84869,18 @@ in (sources."@rushstack/rig-package-0.3.17" // { dependencies = [ sources."resolve-1.17.0" + sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" - sources."@rushstack/rush-sdk-5.89.1" + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.90.0" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.90.0" + sources."@rushstack/rush-sdk-5.90.0" sources."@rushstack/stream-collator-4.0.222" - sources."@rushstack/terminal-0.3.91" + (sources."@rushstack/terminal-0.3.91" // { + dependencies = [ + sources."@types/node-12.20.24" + ]; + }) (sources."@rushstack/ts-command-line-4.13.1" // { dependencies = [ sources."argparse-1.0.10" @@ -85422,17 +84893,17 @@ in sources."@types/lodash-4.14.191" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-12.20.24" + sources."@types/node-18.11.19" sources."@types/node-fetch-1.6.9" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/tunnel-0.0.3" - sources."@vue/compiler-core-3.2.45" - sources."@vue/compiler-dom-3.2.45" - sources."@vue/compiler-sfc-3.2.45" - sources."@vue/compiler-ssr-3.2.45" - sources."@vue/reactivity-transform-3.2.45" - sources."@vue/shared-3.2.45" + sources."@vue/compiler-core-3.2.47" + sources."@vue/compiler-dom-3.2.47" + sources."@vue/compiler-sfc-3.2.47" + sources."@vue/compiler-ssr-3.2.47" + sources."@vue/reactivity-transform-3.2.47" + sources."@vue/shared-3.2.47" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -85642,7 +85113,7 @@ in sources."ignore-5.1.9" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" - sources."immutable-4.2.2" + sources."immutable-4.2.3" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -85882,11 +85353,7 @@ in sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."ramda-0.27.2" - (sources."rc-1.2.8" // { - dependencies = [ - sources."strip-json-comments-2.0.1" - ]; - }) + sources."rc-1.2.8" (sources."rc-config-loader-4.1.2" // { dependencies = [ sources."js-yaml-4.1.0" @@ -85939,7 +85406,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.57.1" + sources."sass-1.58.0" sources."sax-1.2.4" sources."scss-parser-1.0.6" sources."semver-7.3.8" @@ -85974,13 +85441,13 @@ in sources."strip-bom-4.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" - sources."strip-json-comments-3.1.1" + sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."text-table-0.2.0" @@ -86018,7 +85485,7 @@ in sources."uuid-8.3.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - sources."validator-13.7.0" + sources."validator-13.9.0" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -86135,7 +85602,7 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."netrc-0.1.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-version-1.2.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -86178,15 +85645,15 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "9.1.9"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz"; - sha512 = "oRiJArvQcYUJRO0jRWG99KkXuw+HafSnlfWcO4028gTDb4IanRwbl6fw4mELTEAaXAwDGOcuk8R0QY8H3muyiQ=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.2.0.tgz"; + sha512 = "6B1IjDcJbrOu55oMF67L1x5lDUOZ3Zs9l7bKCBH9D78965m8wq/2rlEWl/gJto5TABLQWy3hVvV/s8VzUlRMxw=="; }; dependencies = [ - sources."@angular-devkit/core-15.0.4" - sources."@angular-devkit/schematics-15.0.4" - (sources."@angular-devkit/schematics-cli-15.0.4" // { + sources."@angular-devkit/core-15.1.4" + sources."@angular-devkit/schematics-15.1.4" + (sources."@angular-devkit/schematics-cli-15.1.4" // { dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.4" @@ -86213,12 +85680,19 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@nestjs/schematics-9.0.4" - sources."@types/eslint-8.4.10" + (sources."@nestjs/schematics-9.0.4" // { + dependencies = [ + sources."@angular-devkit/core-15.0.4" + sources."@angular-devkit/schematics-15.0.4" + sources."ajv-8.11.0" + sources."magic-string-0.26.7" + ]; + }) + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -86239,7 +85713,7 @@ in sources."@xtuc/long-4.2.2" sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -86258,11 +85732,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -86279,9 +85753,9 @@ in sources."cosmiconfig-7.1.0" sources."cross-spawn-7.0.3" sources."de-indent-1.0.2" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."defaults-1.0.4" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.12.0" @@ -86303,7 +85777,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-7.2.14" // { + (sources."fork-ts-checker-webpack-plugin-7.3.0" // { dependencies = [ sources."chalk-4.1.2" sources."fs-extra-10.1.0" @@ -86366,7 +85840,7 @@ in }) sources."lru-cache-6.0.0" sources."macos-release-2.5.0" - sources."magic-string-0.26.7" + sources."magic-string-0.27.0" sources."memfs-3.4.13" sources."merge-stream-2.0.0" sources."mime-db-1.52.0" @@ -86378,7 +85852,7 @@ in sources."neo-async-2.6.2" sources."node-abort-controller-3.1.1" sources."node-emoji-1.11.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -86409,7 +85883,7 @@ in sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" - sources."rimraf-3.0.2" + sources."rimraf-4.1.2" sources."run-async-2.4.1" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" @@ -86442,7 +85916,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tapable-2.2.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.3" // { dependencies = [ sources."commander-2.20.3" ]; @@ -86452,7 +85926,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" - sources."tsconfig-paths-4.1.1" + sources."tsconfig-paths-4.1.2" (sources."tsconfig-paths-webpack-plugin-4.0.0" // { dependencies = [ sources."chalk-4.1.2" @@ -86460,7 +85934,7 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" @@ -86531,7 +86005,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."util-deprecate-1.0.2" - sources."wasm-feature-detect-1.4.0" + sources."wasm-feature-detect-1.5.0" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.2.1" ]; @@ -86561,23 +86035,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -86652,7 +86126,7 @@ in sources."arg-4.1.3" ]; }) - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86685,23 +86159,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -86777,7 +86251,7 @@ in sources."arg-4.1.3" ]; }) - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86797,10 +86271,10 @@ in "@tailwindcss/language-server" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_language-server"; packageName = "@tailwindcss/language-server"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.10.tgz"; - sha512 = "4rG07stqhws4/UyRLbHDc+plmxDfTOH/w0sLGvK7LoQq4GaaN0Ov8vEqL60ef94am6pp/ZrjIB5qL6kG7DshHA=="; + url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.11.tgz"; + sha512 = "34E/guiYHdgCSlgyIKy68jmmPJQrMdCIj4Uth7Sgay+s9w4NFSqgnWmktty6oP+jQfhUXQ5o0mIYqzuIZVxazQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -86828,23 +86302,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -86919,7 +86393,7 @@ in sources."arg-4.1.3" ]; }) - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86952,23 +86426,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87046,7 +86520,7 @@ in sources."arg-4.1.3" ]; }) - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -87083,7 +86557,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" @@ -87091,7 +86565,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1304.0" + sources."aws-sdk-2.1309.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -87118,7 +86592,7 @@ in sources."common-tags-1.8.2" sources."connect-redis-6.1.3" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" @@ -87314,7 +86788,7 @@ in sources."util-0.12.5" sources."utils-merge-1.0.1" sources."uuid-8.0.0" - sources."validator-13.7.0" + sources."validator-13.9.0" sources."vary-1.1.2" sources."which-typed-array-1.1.9" sources."wrappy-1.0.2" @@ -87418,7 +86892,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" 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.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -87456,7 +86930,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-block-scoping-7.20.15" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -87507,16 +86981,17 @@ in sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.16" // { + (sources."@graphql-tools/mock-8.7.17" // { dependencies = [ - sources."@graphql-tools/merge-8.3.16" - sources."@graphql-tools/schema-9.0.14" - sources."@graphql-tools/utils-9.1.4" + sources."@graphql-tools/merge-8.3.17" + sources."@graphql-tools/schema-9.0.15" + sources."@graphql-tools/utils-9.2.0" sources."value-or-promise-1.0.12" ]; }) sources."@graphql-tools/schema-8.5.1" sources."@graphql-tools/utils-8.9.0" + sources."@graphql-typed-document-node/core-3.1.1" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@josephg/resolvable-1.0.1" @@ -87559,7 +87034,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -87573,10 +87048,10 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - sources."@vue/compiler-core-3.2.45" - sources."@vue/compiler-dom-3.2.45" + sources."@vue/compiler-core-3.2.47" + sources."@vue/compiler-dom-3.2.47" sources."@vue/compiler-sfc-2.7.14" - sources."@vue/shared-3.2.45" + sources."@vue/shared-3.2.47" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -87649,7 +87124,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -87668,7 +87143,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -87712,7 +87187,7 @@ in ]; }) sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" @@ -87761,7 +87236,7 @@ in sources."pify-2.3.0" ]; }) - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."define-property-2.0.2" @@ -87778,7 +87253,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -87886,7 +87361,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.198.2" + sources."flow-parser-0.199.1" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -88073,7 +87548,7 @@ in sources."nice-try-1.0.5" sources."node-abort-controller-3.1.1" sources."node-dir-0.1.17" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."node-notifier-10.0.1" // { dependencies = [ @@ -88081,7 +87556,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -88255,7 +87730,7 @@ in sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."shellwords-0.1.1" sources."shortid-2.2.16" sources."side-channel-1.0.4" @@ -88593,7 +88068,7 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.3.2" @@ -88676,7 +88151,7 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@npmcli/config-6.1.1" + sources."@npmcli/config-6.1.2" sources."@npmcli/map-workspaces-3.0.1" sources."@npmcli/name-from-folder-2.0.0" sources."@pnpm/network.ca-file-1.0.2" @@ -88695,7 +88170,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" @@ -88723,7 +88198,7 @@ in sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.6" sources."camelcase-7.0.1" (sources."camelcase-keys-8.0.2" // { dependencies = [ @@ -88881,16 +88356,16 @@ in }) sources."mdast-util-from-markdown-1.3.0" sources."mdast-util-frontmatter-1.0.1" - sources."mdast-util-gfm-2.0.1" - sources."mdast-util-gfm-autolink-literal-1.0.2" + sources."mdast-util-gfm-2.0.2" + sources."mdast-util-gfm-autolink-literal-1.0.3" sources."mdast-util-gfm-footnote-1.0.2" - sources."mdast-util-gfm-strikethrough-1.0.2" - sources."mdast-util-gfm-table-1.0.6" + sources."mdast-util-gfm-strikethrough-1.0.3" + sources."mdast-util-gfm-table-1.0.7" sources."mdast-util-gfm-task-list-item-1.0.2" - sources."mdast-util-mdx-2.0.0" - sources."mdast-util-mdx-expression-1.3.1" - sources."mdast-util-mdx-jsx-2.1.0" - sources."mdast-util-mdxjs-esm-1.3.0" + sources."mdast-util-mdx-2.0.1" + sources."mdast-util-mdx-expression-1.3.2" + sources."mdast-util-mdx-jsx-2.1.1" + sources."mdast-util-mdxjs-esm-1.3.1" sources."mdast-util-phrasing-3.0.1" sources."mdast-util-to-markdown-1.5.0" sources."mdast-util-to-nlcst-5.2.1" @@ -89071,7 +88546,7 @@ in sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" sources."trough-2.1.0" - sources."type-fest-3.5.3" + sources."type-fest-3.5.5" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.1" @@ -89121,7 +88596,7 @@ in sources."vfile-find-up-6.0.0" sources."vfile-location-4.0.1" sources."vfile-message-3.1.3" - (sources."vfile-reporter-7.0.4" // { + (sources."vfile-reporter-7.0.5" // { dependencies = [ sources."supports-color-9.3.1" ]; @@ -89189,7 +88664,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" @@ -89205,8 +88680,8 @@ in sources."async-3.2.4" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001449" + sources."browserslist-4.21.5" + sources."caniuse-lite-1.0.30001450" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -89216,7 +88691,7 @@ in sources."convert-source-map-1.9.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -89275,7 +88750,7 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -89349,7 +88824,7 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookies-0.8.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -89519,7 +88994,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -89603,13 +89078,13 @@ in sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; }; dependencies = [ - sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001449" - sources."electron-to-chromium-1.4.284" + sources."browserslist-4.21.5" + sources."caniuse-lite-1.0.30001450" + sources."electron-to-chromium-1.4.286" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.4" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" sources."postcss-8.4.21" @@ -89643,7 +89118,7 @@ in sources."lru-cache-6.0.0" sources."minimist-1.2.7" sources."neo-async-2.6.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."parse-github-url-1.0.2" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -89675,7 +89150,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/yauzl-2.10.0" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" @@ -89685,7 +89160,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1304.0" // { + (sources."aws-sdk-2.1309.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -89881,7 +89356,7 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -89909,10 +89384,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.62.2"; + version = "2.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.62.2.tgz"; - sha512 = "fACUQEdc43AfiqKKXUZLuHB2VADLU965hl50Fn6BhMemFmUsc+iS/GFfOwvfCUO3/iaRtsn/gk+dQ3zZ+snKRw=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.63.2.tgz"; + sha512 = "YtWfPTOiq+cgSIiM2IwjickvJgD1ESBWzK+0+yeauC3XwdaVcfNeTHF3sEqmc5DRMPKV8kAVBBxc0fmuoxcnBQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -89930,10 +89405,10 @@ in awesome-lint = nodeEnv.buildNodePackage { name = "awesome-lint"; packageName = "awesome-lint"; - version = "0.18.1"; + version = "0.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.1.tgz"; - sha512 = "BH2O+hQsUvsStpHvQeSsXHFZ27CqA0JPxu0w8y8bVW5y1hx5BdcGjxAdz+OyjlIns0Iqih44oGQ6XVrkIkAP4g=="; + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.2.tgz"; + sha512 = "SvGJTHprAqu/zjFzdTR78ASdJYWVlcLhkI3WehydUcQOq/RdqxF367R32KK3PTM2nPmJqtBEuxuuux1konWeCw=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -90348,10 +89823,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.24.0"; + version = "13.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.24.0.tgz"; - sha512 = "QP3hY4Ehgjnl5mXmHuXzgU/rnRpMTlpMxr3+JytC2NTNTUTjD5NSm+jJ+fUTHfcfGa8Plos2RTTmiqamHEE7uw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.25.2.tgz"; + sha512 = "+xVDEtjDxxAUAeK/xN3zfLqaWZ+aT0JG8xumsmH2Lahz9IA9CnHMnEEV96MJSuh5i5hBzLBFvMhRF84paPaT2w=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -90377,7 +89852,7 @@ in }) sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@grammyjs/types-2.11.2" + sources."@grammyjs/types-2.12.1" sources."@grpc/grpc-js-1.8.4" sources."@grpc/proto-loader-0.7.4" sources."@handsontable/formulajs-2.0.2" @@ -90403,7 +89878,7 @@ in sources."@types/express-serve-static-core-4.17.33" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -90489,14 +89964,14 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + 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."create-hash-1.2.0" sources."crypto-js-4.1.1" - sources."csv-parse-5.3.3" + sources."csv-parse-5.3.4" sources."debug-2.6.9" sources."defaults-1.0.4" sources."define-property-1.0.0" @@ -90619,13 +90094,22 @@ in (sources."lightning-7.0.3" // { dependencies = [ sources."@grpc/grpc-js-1.8.1" + sources."@types/node-18.11.18" sources."type-fest-3.5.1" ]; }) sources."ln-accounting-6.1.3" sources."ln-service-54.9.0" sources."ln-sync-4.3.0" - sources."ln-telegram-4.6.1" + (sources."ln-telegram-4.6.1" // { + dependencies = [ + (sources."paid-services-4.3.0" // { + dependencies = [ + sources."ln-sync-4.2.0" + ]; + }) + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -90668,7 +90152,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."negotiator-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."nofilter-3.1.0" sources."npmlog-2.0.4" @@ -90692,18 +90176,14 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p2tr-1.3.3" - (sources."paid-services-4.3.0" // { - dependencies = [ - sources."ln-sync-4.2.0" - ]; - }) + sources."paid-services-4.3.3" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."probing-3.0.1" sources."process-nextick-args-2.0.1" - (sources."protobufjs-7.2.0" // { + (sources."protobufjs-7.2.1" // { dependencies = [ sources."long-5.2.1" ]; @@ -90785,7 +90265,7 @@ in sources."tslib-2.5.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-3.5.3" + sources."type-fest-3.5.5" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" @@ -90838,10 +90318,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.6.1.tgz"; - sha512 = "3pzB92+0/+rrR4TdONFhOtczPLQBgobu+27/X2icnS32YzgdMJd7GMzM4V6nBZsrl5jMUY4W/0ExSVGIV3o4aw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.6.2.tgz"; + sha512 = "71mfSt3Q+EMkMCsTRB+26ysRXVxDEyhB0B9gDarxqeUHSc0GAr5CpIql/xeOo0cK5NiNgpOc/xzSj/3wBwc+bg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -90861,7 +90341,7 @@ in sources."is-number-7.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" @@ -90890,6 +90370,24 @@ in bypassCache = true; reconstructLock = true; }; + bibtex-tidy = nodeEnv.buildNodePackage { + name = "bibtex-tidy"; + packageName = "bibtex-tidy"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bibtex-tidy/-/bibtex-tidy-1.8.5.tgz"; + sha512 = "dOcnSb/fn2q3T8rDHLBepPFPBcvWJQJuZthBQgXqMx95+DQOnRDvkjhbeDu9wKItR0lJ4xb5bcHwfiGYWryXpQ=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Tidy bibtex files"; + homepage = "https://github.com/FlamingTempura/bibtex-tidy"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; @@ -91208,7 +90706,7 @@ in sources."safer-buffer-2.1.2" sources."sha.js-2.4.11" sources."shasum-object-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."simple-concat-1.0.1" sources."source-map-0.5.7" (sources."stream-browserify-3.0.0" // { @@ -91268,7 +90766,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."accepts-1.3.8" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -91450,7 +90948,7 @@ in sources."tfunk-4.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."ua-parser-js-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -91500,7 +90998,7 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/types-7.20.7" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -91585,7 +91083,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" @@ -91967,7 +91465,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -92906,7 +92404,7 @@ in sources."terminal-image-0.1.2" sources."through-2.3.8" sources."timed-out-4.0.1" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -93063,14 +92561,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.119"; + version = "2.1.127"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.119.tgz"; - sha512 = "zz7Y0MQgJQxOXOOh/ctmjlGBGrAN1D/V8d+zvrombUIADuX0jE6CYk1zhQVQra82egzpLcxJVtH49FOKjrlXmQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.127.tgz"; + sha512 = "y98slGZZPh37aGqiYv5srj9VcPPaJ4xoG8LReovUlNbovLufgh3XA1EZ7vB0dm2VZ5NCX/RW0LZ7/J3gz7B8Pw=="; }; dependencies = [ - sources."@jsii/check-node-1.73.0" - sources."@jsii/spec-1.73.0" + sources."@jsii/check-node-1.74.0" + sources."@jsii/spec-1.74.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -93084,12 +92582,12 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.6.32" - sources."cdk8s-plus-25-2.4.3" + sources."cdk8s-2.6.40" + sources."cdk8s-plus-25-2.4.12" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.73.0" // { + (sources."codemaker-1.74.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -93098,7 +92596,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.233" + sources."constructs-10.1.241" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -93129,37 +92627,37 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - (sources."jsii-1.73.0" // { + (sources."jsii-1.74.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.73.0" // { + (sources."jsii-pacmak-1.74.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.73.0" // { + (sources."jsii-reflect-1.74.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.73.0" // { + (sources."jsii-rosetta-1.74.0" // { dependencies = [ sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.807" // { + (sources."jsii-srcmak-0.1.815" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.257" + sources."json2jsii-0.3.266" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" @@ -93173,7 +92671,7 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."oo-ascii-tree-1.73.0" + sources."oo-ascii-tree-1.74.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -93252,7 +92750,7 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/types-7.20.7" sources."@cdktf/cli-core-0.15.2" @@ -93266,7 +92764,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - (sources."@jsii/check-node-1.73.0" // { + (sources."@jsii/check-node-1.74.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93276,7 +92774,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.73.0" + sources."@jsii/spec-1.74.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -93287,7 +92785,7 @@ in sources."@sentry/node-6.19.7" sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/node-fetch-2.6.2" sources."@types/prop-types-15.7.5" sources."@types/react-18.0.27" @@ -93327,7 +92825,7 @@ in sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.73.0" // { + (sources."codemaker-1.74.0" // { dependencies = [ sources."decamelize-5.0.1" sources."fs-extra-10.1.0" @@ -93340,7 +92838,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.233" + sources."constructs-10.1.241" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -93350,7 +92848,7 @@ in sources."decamelize-1.2.0" sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."delayed-stream-1.0.0" sources."detect-indent-5.0.0" sources."detect-libc-2.0.1" @@ -93419,7 +92917,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.73.0" // { + (sources."jsii-1.74.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93437,7 +92935,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.73.0" // { + (sources."jsii-pacmak-1.74.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -93453,7 +92951,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.73.0" // { + (sources."jsii-reflect-1.74.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93471,7 +92969,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.73.0" // { + (sources."jsii-rosetta-1.74.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -93483,7 +92981,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.807" // { + (sources."jsii-srcmak-0.1.815" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -93520,14 +93018,14 @@ in sources."ncp-2.0.0" sources."node-abi-3.31.0" sources."node-abort-controller-3.1.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" sources."object-hash-2.2.0" sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.73.0" + sources."oo-ascii-tree-1.74.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -93567,7 +93065,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" @@ -93623,7 +93121,7 @@ in sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" - sources."xstate-4.35.3" + sources."xstate-4.35.4" sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-17.6.2" // { @@ -93879,10 +93377,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.27.0"; + version = "0.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.27.0.tgz"; - sha512 = "XNV8x2adzhenq9uh5rBRsCYvfUiLQJ3mEtj5kKgwxIDa9+kDEEfl/CVDXnx0lM2aa2f845cWCxfL9XNCejOwDQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.28.0.tgz"; + sha512 = "oTltDkfXQ2PEwameTTo6yzDL23M+YXWrw/Clci5A/1ugBnfVLE05iIjRMMjSlJXsbl/90S7wcIzJeO+PlsgA6w=="; }; buildInputs = globalBuildInputs; meta = { @@ -93932,10 +93430,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.8"; + version = "0.23.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.8.tgz"; - sha512 = "knOr++uIcb+RppNXja+JrU1heoRDiW4v3GEzApJPsEgyjAaH6sZMh/XU5upFp7OSmeX++ZLndPUeumjzQuAbOg=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.9.tgz"; + sha512 = "vfBZoEiPJeA7X8ZYYgquywFIsiMNIc0eYEfgcdLinDPs7fDftgBS9Y58ngUIl4vtm18lTTUIPeFazyy2P9fSTQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94025,10 +93523,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.26.1"; + version = "0.26.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.1.tgz"; - sha512 = "L2qnieIfAu4Eqv6+1Cir4vO0E8AI8/8Meqc5GsYdwEiblMRGmB8XnIJoIYY7RhdS4jztw25EmLfBcj11q0JTRQ=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.2.tgz"; + sha512 = "DbyKQJcOj4q0EiK4SjNl9ZNvcHhjrtc6Jx3S4B0IbK/73twa3bYevHZxnSET7ZuLGFUq7as/1LUFkiaPRXjTDg=="; }; dependencies = [ sources."@sindresorhus/chunkify-0.2.0" @@ -94207,7 +93705,7 @@ in sha512 = "NXmTfHF/TxysUeSstDyLUcfv6LlK08PnltVZCe1J7XpG/QHRRq0sjhkNqkHJVfFT/Vo2NC4lv5Bc9UIWdjGGuw=="; }; dependencies = [ - sources."typescript-4.9.4" + sources."typescript-4.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -94239,11 +93737,28 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.6.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.6.0.tgz"; - sha512 = "fMEM9CUlsUODmXtmFQG+ppOqnem65X9qR+SqWndhw9LiE4NdsLsRm7pJmTT5Dz/R0AT7JaOfJeWi0gyUSSL25A=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.14.1.tgz"; + sha512 = "1QpsmzpcToU+kt9xp8XfncPdOH8I7W8vV+dDNDiDG/F6e0rkqFFI8vJseGW4gd5hms5fMK0bJs8zFSoP1GcPUw=="; }; + dependencies = [ + sources."anymatch-3.1.3" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."chokidar-3.5.3" + sources."fill-range-7.0.1" + sources."fsevents-2.3.2" + sources."glob-parent-5.1.2" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."normalize-path-3.0.0" + sources."picomatch-2.3.1" + sources."readdirp-3.6.0" + sources."to-regex-range-5.0.1" + ]; buildInputs = globalBuildInputs; meta = { description = "Java language extension for coc.nvim"; @@ -94472,7 +93987,7 @@ in sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -94489,7 +94004,7 @@ in }) sources."ncp-2.0.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" sources."object-inspect-1.12.3" @@ -94520,7 +94035,7 @@ in sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."streamroller-3.1.4" @@ -94611,13 +94126,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.291"; + version = "1.1.292"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.291.tgz"; - sha512 = "Ffl7Gynb4zqsmUelEFuB1gqV5tFGGR/+Btd8l7/YVZVZ3M2/Ur9nBa6K8+inWPMQUkZ00nQEbXGDKeOzDLDcJQ=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.292.tgz"; + sha512 = "v+Auhb3ckDA19un8/+ToqsvIsyAIR66ndTVhM8rY0dBXULz+X5ip/BOy9TbxNJ+JbObATVWa6SwyIPZ97bwq6w=="; }; dependencies = [ - sources."pyright-1.1.291" + sources."pyright-1.1.292" ]; buildInputs = globalBuildInputs; meta = { @@ -95019,7 +94534,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" @@ -95057,11 +94572,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95098,7 +94613,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -95199,7 +94714,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."lru-cache-6.0.0" @@ -95421,7 +94936,7 @@ in sources."@taplo/lsp-0.2.4" sources."encoding-0.1.13" sources."iconv-lite-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."safer-buffer-2.1.2" sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -95541,7 +95056,7 @@ in sha512 = "rzom53icaFoCF7p6Ps0dHqflS8yv+hOtQw43qOS4NL3b+rnulkfNracHFzuH1n1tyQWCzLgs73cAL1pBGrkUHQ=="; }; dependencies = [ - sources."typescript-4.9.4" + sources."typescript-4.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -95752,7 +95267,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -96132,7 +95647,7 @@ in sources."lodash-4.17.21" sources."require-directory-2.1.1" sources."rxjs-7.8.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."spawn-command-0.0.2" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -96564,7 +96079,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-6.0.0" @@ -96585,7 +96100,7 @@ in sources."pify-5.0.0" ]; }) - sources."cordova-serve-4.0.0" + sources."cordova-serve-4.0.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" @@ -96972,10 +96487,10 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.17.4" + sources."systeminformation-5.17.8" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."through-2.3.8" @@ -97208,7 +96723,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -97473,10 +96988,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.19.2"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.19.2.tgz"; - sha512 = "nyrxnTcv1UzzdElZe96OMU8mxJGaLBnmPCR/HOaFE367EZD+WS5fcpoDBHC9tfD7yJv4+q5sjByYZltcV6jo0A=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.22.0.tgz"; + sha512 = "cyF2xyV5nqXw3y5f/r/XxEF+3aj6dxwDLIRW1SYDZ8gV1I9pZwupgM7+jwmqes0CNf/mbAbWbhNQrh2MP2NsfA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -97491,10 +97006,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-6.19.2" - sources."@cspell/cspell-pipe-6.19.2" - sources."@cspell/cspell-service-bus-6.19.2" - sources."@cspell/cspell-types-6.19.2" + sources."@cspell/cspell-bundled-dicts-6.22.0" + sources."@cspell/cspell-pipe-6.22.0" + sources."@cspell/cspell-service-bus-6.22.0" + sources."@cspell/cspell-types-6.22.0" sources."@cspell/dict-ada-4.0.1" sources."@cspell/dict-aws-3.0.0" sources."@cspell/dict-bash-4.1.1" @@ -97509,7 +97024,7 @@ in sources."@cspell/dict-dotnet-4.0.1" sources."@cspell/dict-elixir-4.0.1" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.2.0" + sources."@cspell/dict-en_us-4.2.1" sources."@cspell/dict-filetypes-3.0.0" sources."@cspell/dict-fonts-3.0.0" sources."@cspell/dict-fullstack-3.1.1" @@ -97540,7 +97055,8 @@ in sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.0" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/strong-weak-map-6.19.2" + sources."@cspell/dynamic-import-6.22.0" + sources."@cspell/strong-weak-map-6.22.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -97563,13 +97079,13 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.0.0" sources."crypto-random-string-2.0.0" - sources."cspell-dictionary-6.19.2" - sources."cspell-gitignore-6.19.2" - sources."cspell-glob-6.19.2" - sources."cspell-grammar-6.19.2" - sources."cspell-io-6.19.2" - sources."cspell-lib-6.19.2" - sources."cspell-trie-lib-6.19.2" + sources."cspell-dictionary-6.22.0" + sources."cspell-gitignore-6.22.0" + sources."cspell-glob-6.22.0" + sources."cspell-grammar-6.22.0" + sources."cspell-io-6.22.0" + sources."cspell-lib-6.22.0" + sources."cspell-trie-lib-6.22.0" sources."dot-prop-5.3.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -97584,7 +97100,6 @@ in sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" sources."gensequence-4.0.3" sources."get-stdin-8.0.0" @@ -97601,6 +97116,7 @@ in sources."resolve-from-4.0.0" ]; }) + sources."import-meta-resolve-2.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -97614,7 +97130,6 @@ in sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" - sources."jsonfile-6.1.0" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" sources."lru-cache-6.0.0" @@ -97626,7 +97141,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -97652,7 +97167,6 @@ in sources."tr46-0.0.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."universalify-2.0.0" sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-uri-3.0.7" sources."webidl-conversions-3.0.1" @@ -98481,10 +97995,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.96.1"; + version = "6.96.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.1.tgz"; - sha512 = "YXsVhkOvhfSRj1oQsb+30nAX7VNEwAM8hoNV+DSz9uj+HrW4t5DWm2g7Cbc/LzpxPqFnLzp0nQCAvn84oudxMQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.2.tgz"; + sha512 = "088BO37L02/La+XnRoEFkBxm3u23pPLc/VSuW7Ee60sl428/3Rznim8zvQCydiLtgDtMIkfY20cK4ReeUvXuhA=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -98682,7 +98196,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" @@ -98929,7 +98443,7 @@ in sources."node-abi-3.31.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-9.3.1" sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" @@ -99045,7 +98559,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."through-2.3.8" @@ -99098,10 +98612,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "3.4.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.4.1.tgz"; - sha512 = "YLeowqdlv7xHh7JBo3uYOjh5g2nZJFH5l6xIY/MO/f3vEEgHDltE8oXwgZ8JHzQ8n/PntyRZwffxVDsxMMS7vw=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.5.2.tgz"; + sha512 = "+o6ICGEyzvEfM3KPTo6lM2foKR4CrdyDPmFBSQYdNux6G5LByUnHG4NA6YEtRYk7dnhQ+BpCq5bYrb9l2Yi6mA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -99111,7 +98625,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@expo/apple-utils-0.0.0-alpha.34" + sources."@expo/apple-utils-0.0.0-alpha.37" (sources."@expo/bunyan-4.0.0" // { dependencies = [ sources."uuid-8.3.2" @@ -99131,10 +98645,11 @@ in ]; }) sources."@expo/config-types-47.0.0" - sources."@expo/eas-build-job-0.2.102" - (sources."@expo/eas-json-3.3.2" // { + sources."@expo/eas-build-job-0.2.103" + (sources."@expo/eas-json-3.5.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" + sources."@expo/eas-build-job-0.2.102" ]; }) (sources."@expo/image-utils-0.3.22" // { @@ -99273,7 +98788,7 @@ in sources."commander-4.1.1" sources."component-type-1.2.1" sources."concat-map-0.0.1" - sources."content-type-1.0.4" + sources."content-type-1.0.5" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -99301,7 +98816,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."exec-async-2.2.0" - (sources."expo-modules-autolinking-1.0.2" // { + (sources."expo-modules-autolinking-1.1.0" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" @@ -99406,7 +98921,7 @@ in ]; }) sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -99709,7 +99224,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -99745,14 +99260,14 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."bufferutil-4.0.7" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -99782,7 +99297,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -99872,7 +99387,7 @@ in sources."ms-2.1.2" sources."nice-try-1.0.5" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -99938,7 +99453,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."signal-exit-3.0.7" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { @@ -100021,10 +99536,10 @@ in dependencies = [ sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.4.0" - sources."@azure/core-client-1.7.0" + sources."@azure/core-client-1.7.1" sources."@azure/core-http-compat-1.3.0" - sources."@azure/core-lro-2.5.0" - sources."@azure/core-paging-1.4.0" + sources."@azure/core-lro-2.5.1" + sources."@azure/core-paging-1.5.0" (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" @@ -100087,21 +99602,21 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@fluentui/date-time-utilities-8.5.4" - sources."@fluentui/dom-utilities-2.2.4" - sources."@fluentui/font-icons-mdl2-8.5.7" - sources."@fluentui/foundation-legacy-8.2.27" - sources."@fluentui/keyboard-key-0.4.4" - sources."@fluentui/merge-styles-8.5.5" - sources."@fluentui/react-8.104.8" - sources."@fluentui/react-focus-8.8.13" - sources."@fluentui/react-hooks-8.6.15" + sources."@fluentui/date-time-utilities-8.5.5" + sources."@fluentui/dom-utilities-2.2.5" + sources."@fluentui/font-icons-mdl2-8.5.8" + sources."@fluentui/foundation-legacy-8.2.28" + sources."@fluentui/keyboard-key-0.4.5" + sources."@fluentui/merge-styles-8.5.6" + sources."@fluentui/react-8.105.3" + sources."@fluentui/react-focus-8.8.14" + sources."@fluentui/react-hooks-8.6.16" sources."@fluentui/react-portal-compat-context-9.0.4" - sources."@fluentui/react-window-provider-2.2.5" - sources."@fluentui/set-version-8.2.4" - sources."@fluentui/style-utilities-8.9.0" - sources."@fluentui/theme-2.6.21" - sources."@fluentui/utilities-8.13.5" + sources."@fluentui/react-window-provider-2.2.6" + sources."@fluentui/set-version-8.2.5" + sources."@fluentui/style-utilities-8.9.1" + sources."@fluentui/theme-2.6.22" + sources."@fluentui/utilities-8.13.6" sources."@gar/promisify-1.1.3" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ @@ -100154,7 +99669,7 @@ in sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" sources."@redis/bloom-1.2.0" - sources."@redis/client-1.5.3" + sources."@redis/client-1.5.5" sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" sources."@redis/search-1.1.1" @@ -100166,18 +99681,18 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@szmarczak/http-timer-1.1.2" sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" @@ -100191,7 +99706,7 @@ in sources."@types/connect-3.4.35" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/express-4.17.13" @@ -100363,7 +99878,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-2.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" @@ -100393,7 +99908,7 @@ in sources."body-parser-1.19.0" sources."brace-expansion-2.0.1" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."bson-1.1.6" sources."buffer-5.7.1" sources."buffer-equal-1.0.1" @@ -100426,7 +99941,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -100503,7 +100018,7 @@ in }) sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" @@ -100586,7 +100101,7 @@ in sources."each-props-1.3.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -101133,7 +100648,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-5.1.6" sources."minimist-1.2.5" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -101267,7 +100782,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."mysql2-3.0.1" // { + (sources."mysql2-3.1.0" // { dependencies = [ sources."iconv-lite-0.6.3" sources."lru-cache-7.14.1" @@ -101292,7 +100807,7 @@ in sources."node-abi-3.31.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" @@ -101304,7 +100819,7 @@ in ]; }) sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -101512,7 +101027,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."redis-4.6.2" + sources."redis-4.6.4" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" @@ -101742,7 +101257,7 @@ in sources."sprintf-js-1.1.2" ]; }) - (sources."terser-5.16.1" // { + (sources."terser-5.16.3" // { dependencies = [ sources."acorn-8.8.2" sources."commander-2.20.3" @@ -101937,7 +101452,7 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -101985,7 +101500,7 @@ in sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/express-4.17.16" + sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.3" @@ -101996,7 +101511,7 @@ in sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" @@ -102135,18 +101650,18 @@ in sources."yallist-3.1.1" ]; }) - (sources."@vue/compiler-core-3.2.45" // { + (sources."@vue/compiler-core-3.2.47" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.45" - (sources."@vue/compiler-sfc-3.2.45" // { + sources."@vue/compiler-dom-3.2.47" + (sources."@vue/compiler-sfc-3.2.47" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.2.45" + sources."@vue/compiler-ssr-3.2.47" (sources."@vue/component-compiler-utils-3.3.0" // { dependencies = [ sources."hash-sum-1.0.2" @@ -102160,8 +101675,8 @@ in sources."@vue/eslint-config-prettier-6.0.0" sources."@vue/eslint-config-typescript-7.0.0" sources."@vue/preload-webpack-plugin-1.1.2" - sources."@vue/reactivity-transform-3.2.45" - sources."@vue/shared-3.2.45" + sources."@vue/reactivity-transform-3.2.47" + sources."@vue/shared-3.2.47" sources."@vue/web-component-wrapper-1.3.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -102235,7 +101750,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."async-foreach-0.1.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -102304,7 +101819,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -102348,7 +101863,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -102439,7 +101954,7 @@ in sources."consolidate-0.15.1" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" @@ -102554,7 +102069,7 @@ in sources."decode-uri-component-0.2.2" sources."deep-equal-1.1.1" sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" (sources."default-gateway-5.0.5" // { dependencies = [ sources."cross-spawn-7.0.3" @@ -102625,7 +102140,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103229,7 +102744,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" (sources."node-sass-6.0.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -103779,7 +103294,7 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."shelljs-0.8.5" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" @@ -103927,7 +103442,7 @@ in (sources."tar-6.1.13" // { dependencies = [ sources."chownr-2.0.0" - sources."minipass-4.0.0" + sources."minipass-4.0.2" sources."mkdirp-1.0.4" ]; }) @@ -104276,10 +103791,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.32.0"; + version = "8.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz"; - sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz"; + sha512 = "WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA=="; }; dependencies = [ sources."@eslint/eslintrc-1.4.1" @@ -104307,7 +103822,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.32.0" + sources."eslint-8.33.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -104432,7 +103947,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.32.0" + sources."eslint-8.33.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -104600,7 +104115,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" 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.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -104643,7 +104158,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-block-scoping-7.20.15" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -104911,10 +104426,10 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" - sources."@types/express-4.17.16" + sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" @@ -104927,7 +104442,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" @@ -105035,7 +104550,7 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -105056,7 +104571,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -105118,7 +104633,7 @@ in }) sources."connect-history-api-fallback-2.0.0" sources."content-disposition-0.5.2" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -105176,7 +104691,7 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."default-gateway-4.2.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" @@ -105202,7 +104717,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -105574,11 +105089,11 @@ in sources."nested-error-stacks-2.0.1" sources."nice-try-1.0.5" sources."no-case-3.0.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-0.10.0" sources."node-gyp-build-4.6.0" sources."node-html-parser-5.4.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" (sources."npm-package-arg-6.1.0" // { @@ -105942,7 +105457,7 @@ in sources."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" sources."mkdirp-1.0.4" ]; }) @@ -105955,7 +105470,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.3" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -106157,7 +105672,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -106173,7 +105688,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" sources."@types/react-18.0.27" @@ -106195,7 +105710,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" @@ -106204,7 +105719,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -106230,7 +105745,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -106305,7 +105820,7 @@ in sources."ms-2.1.2" sources."node-fetch-2.6.7" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."lru-cache-6.0.0" @@ -106362,7 +105877,7 @@ in sources."safer-buffer-2.1.2" sources."scheduler-0.20.2" sources."semver-6.3.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -106451,10 +105966,11 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.22" - sources."@oclif/config-1.18.6" + sources."@oclif/config-1.18.8" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { dependencies = [ + sources."@oclif/config-1.18.6" sources."wrap-ansi-6.2.0" ]; }) @@ -106569,7 +106085,7 @@ in sources."semver-5.7.1" ]; }) - sources."csv-parse-5.3.3" + sources."csv-parse-5.3.4" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.4" @@ -106705,7 +106221,7 @@ in }) sources."nice-try-1.0.5" sources."node-abort-controller-3.1.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -106824,10 +106340,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.21.0"; + version = "11.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.21.0.tgz"; - sha512 = "9J70y9E4t80rAGs9fvtTt2jhqMUNwOch0F7uqG/OQn6rRSkKGqpnaozUkCjRCmWaQi0bM8vYxruGyD0E+sqZlw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.22.0.tgz"; + sha512 = "wTM/bjceNKipTQTk1ocpAvqg9075L/wWAzScLB+M9uzYSBaz8xA0lfOPo0e6L0AoXpOXJBkOBTlcJ6No0LQ66w=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { @@ -106835,7 +106351,7 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@gar/promisify-1.1.3" @@ -106848,9 +106364,10 @@ in sources."google-auth-library-8.7.0" ]; }) - sources."@grpc/grpc-js-1.7.3" + sources."@grpc/grpc-js-1.8.7" sources."@grpc/proto-loader-0.7.4" sources."@jsdevtools/ono-7.1.3" + sources."@jsdoc/salty-0.2.3" (sources."@npmcli/fs-2.1.2" // { dependencies = [ sources."semver-7.3.8" @@ -106873,12 +106390,15 @@ in sources."@protobufjs/utf8-1.1.0" sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.1" + sources."@types/glob-8.0.1" sources."@types/json-schema-7.0.11" sources."@types/linkify-it-3.0.2" sources."@types/long-4.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" - sources."@types/node-18.11.18" + sources."@types/minimatch-5.1.2" + sources."@types/node-18.11.19" + sources."@types/rimraf-3.0.2" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -107034,7 +106554,7 @@ in }) sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -107055,7 +106575,7 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."csv-parse-5.3.3" + sources."csv-parse-5.3.4" sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" @@ -107204,7 +106724,7 @@ in sources."gtoken-5.3.2" ]; }) - (sources."google-gax-3.5.2" // { + (sources."google-gax-3.5.6" // { dependencies = [ sources."google-auth-library-8.7.0" ]; @@ -107274,7 +106794,7 @@ in }) sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - sources."jsdoc-3.6.11" + sources."jsdoc-4.0.0" sources."json-bigint-1.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json-ptr-3.1.1" @@ -107380,7 +106900,7 @@ in sources."netmask-2.0.2" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" (sources."node-gyp-9.3.1" // { dependencies = [ @@ -107435,12 +106955,12 @@ in }) sources."proto-list-1.2.4" sources."proto3-json-serializer-1.1.0" - (sources."protobufjs-7.1.2" // { + (sources."protobufjs-7.2.1" // { dependencies = [ sources."long-5.2.1" ]; }) - (sources."protobufjs-cli-1.0.2" // { + (sources."protobufjs-cli-1.1.1" // { dependencies = [ sources."glob-8.1.0" sources."minimatch-5.1.6" @@ -107561,10 +107081,9 @@ in }) sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" - sources."taffydb-2.6.2" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."tar-stream-2.2.0" @@ -107625,7 +107144,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-fetch-3.6.2" @@ -107943,7 +107462,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.1" sources."@types/inquirer-6.5.0" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -108070,7 +107589,7 @@ in sources."mute-stream-0.0.8" sources."nedb-1.8.0" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."number-to-bn-1.7.0" // { dependencies = [ @@ -108136,7 +107655,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.8.1" + sources."web3-utils-1.8.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -108195,7 +107714,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" @@ -108659,15 +108178,15 @@ in ganache = nodeEnv.buildNodePackage { name = "ganache"; packageName = "ganache"; - version = "7.7.3"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/ganache/-/ganache-7.7.3.tgz"; - sha512 = "dZTUHjzSuvDTMUpKaBTWJnpcWpsBUtqciA8ttdmC/r/XRXJhDa0EpypisYULhoV8tx76G08mOuM/B1vhPbh20A=="; + url = "https://registry.npmjs.org/ganache/-/ganache-7.7.4.tgz"; + sha512 = "ies0uaFAnHrTzCJaCg/FYFVD4B9DFouKkWpEmQDCQRYwT4n5SqbZDR7aIDy/iATtBzkJJsQ6RptE9Ovr32Dmpw=="; }; dependencies = [ sources."@types/bn.js-5.1.1" sources."@types/lru-cache-5.1.1" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -108753,7 +108272,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/plugin-syntax-typescript-7.20.0" sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" @@ -108774,12 +108293,12 @@ in sources."@lmdb/lmdb-linux-arm64-2.5.3" sources."@lmdb/lmdb-linux-x64-2.5.3" sources."@lmdb/lmdb-win32-x64-2.5.3" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.0" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" @@ -108792,7 +108311,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -108811,7 +108330,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -108819,7 +108338,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -108880,7 +108399,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -108982,15 +108501,19 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."msgpackr-1.8.2" - sources."msgpackr-extract-2.2.0" + sources."msgpackr-1.8.3" + (sources."msgpackr-extract-3.0.0" // { + dependencies = [ + sources."node-gyp-build-optional-packages-5.0.7" + ]; + }) sources."mute-stream-0.0.8" sources."nice-try-1.0.5" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-optional-packages-5.0.3" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.1.1" @@ -109125,10 +108648,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.2.tgz"; - sha512 = "MWUDKWKtsYNT/eNZcFYoxHPatM4aAUFjSiI19RTOozd1tDiHBkIzWY28bRcE81eanJU3HQ8Djle5hDQG04K0hg=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.3.tgz"; + sha512 = "GFZl5L6XkpkdVNx/3heQl485Hho7Ub2oWSxAVfzw8/SnpEZEHUJ97u032bUmftkNO+db4YEC8qJGIiOVRcwATw=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -109403,7 +108926,7 @@ in sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" @@ -109511,7 +109034,7 @@ in sources."rechoir-0.6.2" sources."remove-trailing-separator-1.1.0" sources."replace-ext-1.0.1" - sources."request-light-0.6.0" + sources."request-light-0.7.0" sources."resolve-1.22.1" sources."restore-cursor-3.1.0" sources."retry-0.12.0" @@ -109553,7 +109076,7 @@ in sources."taketalk-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."text-table-0.2.0" @@ -109661,7 +109184,7 @@ in sources."iconv-lite-0.6.3" sources."iterall-1.3.0" sources."minimist-1.2.7" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."safer-buffer-2.1.2" sources."supports-color-5.5.0" sources."tr46-0.0.3" @@ -109939,7 +109462,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -110043,10 +109566,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "7.0.3"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-7.0.3.tgz"; - sha512 = "SXSREEuKbxiU/FAaCxvqSNCBeMKbOw0JoilOPb7DJ1hJZclbzD/OTPcFEJWkMgnIDFcWgEew1jS9yVDt3KKD5A=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-7.1.0.tgz"; + sha512 = "Vyu+Q+HykTMoWH8A6h1Dbx7MyP+Tv4UN5mc4Cjrr2Pj3sqT22RG0m7CyJqAX+W+9TogpwTZz2azFQw9hWJqEqg=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -110079,29 +109602,25 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."ansi-escapes-6.0.0" + (sources."ansi-escapes-6.0.0" // { + dependencies = [ + sources."type-fest-3.5.5" + ]; + }) sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" sources."arrify-1.0.1" sources."ast-types-0.13.4" - sources."atomically-1.7.0" + sources."atomically-2.0.0" sources."base64-js-1.5.1" sources."bl-5.1.0" - (sources."boxen-7.0.1" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) + sources."boxen-7.0.1" sources."buffer-6.0.3" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.6" sources."camelcase-7.0.1" - (sources."camelcase-keys-8.0.2" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) + sources."camelcase-keys-8.0.2" sources."chalk-5.2.0" sources."chardet-0.7.0" sources."ci-info-3.7.1" @@ -110112,13 +109631,17 @@ in sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."conf-10.2.0" + sources."conf-11.0.1" (sources."config-chain-1.1.13" // { dependencies = [ sources."ini-1.3.8" ]; }) - sources."configstore-6.0.0" + (sources."configstore-6.0.0" // { + dependencies = [ + sources."dot-prop-6.0.1" + ]; + }) sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."crypto-random-string-4.0.0" // { @@ -110127,7 +109650,7 @@ in ]; }) sources."data-uri-to-buffer-4.0.1" - sources."debounce-fn-4.0.0" + sources."debounce-fn-5.1.2" sources."debug-4.3.4" sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { @@ -110147,10 +109670,10 @@ in sources."defer-to-connect-2.0.1" sources."degenerator-3.0.2" sources."depd-2.0.0" - sources."dot-prop-6.0.1" + sources."dot-prop-7.2.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."env-paths-2.2.1" + sources."env-paths-3.0.0" sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-5.0.0" @@ -110158,19 +109681,14 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - (sources."execa-6.1.0" // { - dependencies = [ - sources."mimic-fn-4.0.0" - sources."onetime-6.0.0" - ]; - }) + sources."execa-6.1.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" sources."fetch-blob-3.2.0" sources."figures-5.0.0" sources."file-uri-to-path-2.0.0" - sources."find-up-3.0.0" + sources."find-up-6.3.0" sources."form-data-encoder-2.1.4" sources."formdata-polyfill-4.0.10" sources."fs-extra-8.1.0" @@ -110240,26 +109758,26 @@ in sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-7.0.3" + sources."json-schema-typed-8.0.1" sources."jsonfile-4.0.0" sources."keyv-4.5.2" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."levn-0.3.0" sources."lines-and-columns-1.2.4" - (sources."locate-path-3.0.0" // { - dependencies = [ - sources."path-exists-3.0.0" - ]; - }) + sources."locate-path-7.1.1" sources."lodash-4.17.21" sources."log-symbols-5.1.0" sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - sources."meow-11.0.0" + (sources."meow-11.0.0" // { + dependencies = [ + sources."type-fest-3.5.5" + ]; + }) sources."merge-stream-2.0.0" - sources."mimic-fn-3.1.0" + sources."mimic-fn-4.0.0" sources."mimic-response-4.0.0" sources."min-indent-1.0.1" sources."minimist-1.2.7" @@ -110276,18 +109794,13 @@ in sources."path-key-4.0.0" ]; }) - (sources."onetime-5.1.2" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) + sources."onetime-6.0.0" sources."optionator-0.8.3" sources."ora-6.1.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" sources."pac-proxy-agent-5.0.0" sources."pac-resolver-5.0.1" sources."package-json-8.1.0" @@ -110295,7 +109808,6 @@ in sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."picocolors-1.0.0" - sources."pkg-up-3.1.0" sources."prelude-ls-1.1.2" sources."proto-list-1.2.4" (sources."proxy-agent-5.0.0" // { @@ -110318,18 +109830,9 @@ in dependencies = [ sources."hosted-git-info-4.1.0" sources."normalize-package-data-3.0.3" - sources."type-fest-2.19.0" - ]; - }) - (sources."read-pkg-up-9.1.0" // { - dependencies = [ - sources."find-up-6.3.0" - sources."locate-path-7.1.1" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."type-fest-2.19.0" ]; }) + sources."read-pkg-up-9.1.0" sources."readable-stream-3.6.0" sources."redent-4.0.0" sources."registry-auth-token-5.0.1" @@ -110337,7 +109840,12 @@ in sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - sources."restore-cursor-4.0.0" + (sources."restore-cursor-4.0.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + ]; + }) sources."run-async-2.4.1" sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" @@ -110367,6 +109875,7 @@ in sources."strip-final-newline-3.0.0" sources."strip-indent-4.0.0" sources."strip-json-comments-2.0.1" + sources."stubborn-fs-1.2.1" sources."supports-color-5.5.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -110374,7 +109883,7 @@ in sources."trim-newlines-4.0.2" sources."tslib-2.5.0" sources."type-check-0.3.2" - sources."type-fest-3.5.3" + sources."type-fest-2.19.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."universalify-0.1.2" @@ -110383,10 +109892,11 @@ in sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."validator-13.7.0" - sources."vm2-3.9.13" + sources."validator-13.9.0" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.2.1" + sources."when-exit-2.0.0" sources."which-2.0.2" sources."widest-line-4.0.1" sources."word-wrap-1.2.3" @@ -110525,7 +110035,7 @@ in sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -110619,7 +110129,7 @@ in sources."iconv-lite-0.6.3" sources."idb-keyval-6.2.0" sources."inversify-6.0.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."reflect-metadata-0.1.13" sources."safari-14-idb-fix-3.0.0" sources."safer-buffer-2.1.2" @@ -110718,9 +110228,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.7.15" // { + (sources."@graphql-tools/import-6.7.16" // { dependencies = [ - sources."@graphql-tools/utils-9.1.4" + sources."@graphql-tools/utils-9.2.0" sources."tslib-2.5.0" ]; }) @@ -110771,6 +110281,7 @@ in sources."value-or-promise-1.0.6" ]; }) + sources."@graphql-typed-document-node/core-3.1.1" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@microsoft/fetch-event-source-2.0.1" @@ -110779,7 +110290,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -111262,29 +110773,29 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/polyfill-7.12.1" sources."@babel/types-7.20.7" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.5.15" - (sources."@graphql-tools/delegate-9.0.23" // { + sources."@graphql-tools/batch-execute-8.5.16" + sources."@graphql-tools/delegate-9.0.25" + sources."@graphql-tools/executor-0.0.13" + sources."@graphql-tools/executor-graphql-ws-0.0.9" + (sources."@graphql-tools/executor-http-0.1.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."@whatwg-node/fetch-0.6.5" ]; }) - sources."@graphql-tools/executor-0.0.12" - sources."@graphql-tools/executor-graphql-ws-0.0.7" - sources."@graphql-tools/executor-http-0.1.1" - sources."@graphql-tools/executor-legacy-ws-0.0.6" - sources."@graphql-tools/graphql-file-loader-7.5.14" - sources."@graphql-tools/import-6.7.15" - sources."@graphql-tools/json-file-loader-7.4.15" - sources."@graphql-tools/load-7.8.10" - sources."@graphql-tools/merge-8.3.16" - sources."@graphql-tools/schema-9.0.14" - sources."@graphql-tools/url-loader-7.17.4" - sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.2" + sources."@graphql-tools/executor-legacy-ws-0.0.7" + sources."@graphql-tools/graphql-file-loader-7.5.15" + sources."@graphql-tools/import-6.7.16" + sources."@graphql-tools/json-file-loader-7.4.16" + sources."@graphql-tools/load-7.8.11" + sources."@graphql-tools/merge-8.3.17" + sources."@graphql-tools/schema-9.0.15" + sources."@graphql-tools/url-loader-7.17.9" + sources."@graphql-tools/utils-9.2.0" + sources."@graphql-tools/wrap-9.3.4" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" @@ -111294,17 +110805,22 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.4" - sources."@vue/compiler-core-3.2.45" - sources."@vue/compiler-dom-3.2.45" - sources."@vue/compiler-sfc-3.2.45" - sources."@vue/compiler-ssr-3.2.45" - sources."@vue/reactivity-transform-3.2.45" - sources."@vue/shared-3.2.45" - sources."@whatwg-node/fetch-0.6.2" - sources."abort-controller-3.0.0" + sources."@vue/compiler-core-3.2.47" + sources."@vue/compiler-dom-3.2.47" + sources."@vue/compiler-sfc-3.2.47" + sources."@vue/compiler-ssr-3.2.47" + sources."@vue/reactivity-transform-3.2.47" + sources."@vue/shared-3.2.47" + sources."@whatwg-node/events-0.0.2" + (sources."@whatwg-node/fetch-0.6.7" // { + dependencies = [ + sources."@whatwg-node/node-fetch-0.0.3" + ]; + }) + sources."@whatwg-node/node-fetch-0.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."arg-4.1.3" @@ -111337,17 +110853,10 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" - sources."event-target-shim-5.0.1" sources."extract-files-11.0.0" sources."fast-glob-3.2.12" sources."fastq-1.15.0" sources."fill-range-7.0.1" - sources."form-data-encoder-1.7.2" - (sources."formdata-node-4.4.1" // { - dependencies = [ - sources."web-streams-polyfill-4.0.0-beta.3" - ]; - }) sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.2.3" @@ -111362,7 +110871,7 @@ in }) sources."graphql-language-service-5.1.1" sources."graphql-language-service-server-2.9.5" - sources."graphql-ws-5.11.2" + sources."graphql-ws-5.11.3" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."ignore-5.2.4" @@ -111392,8 +110901,7 @@ in sources."mkdirp-1.0.4" sources."nanoid-3.3.4" sources."node-abort-controller-3.1.1" - sources."node-domexception-1.0.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" @@ -111431,8 +110939,7 @@ in sources."tr46-0.0.3" sources."ts-node-9.1.1" sources."tslib-2.5.0" - sources."typescript-4.9.4" - sources."undici-5.16.0" + sources."typescript-4.9.5" sources."unixify-1.0.0" sources."urlpattern-polyfill-6.0.2" sources."utf-8-validate-6.0.2" @@ -111497,40 +111004,40 @@ in }) sources."@cronvel/get-pixels-3.4.1" sources."@cspotcode/source-map-support-0.8.1" - sources."@graphql-tools/batch-execute-8.5.15" - (sources."@graphql-tools/delegate-9.0.23" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."@graphql-tools/executor-0.0.12" - (sources."@graphql-tools/executor-graphql-ws-0.0.7" // { + sources."@graphql-tools/batch-execute-8.5.16" + sources."@graphql-tools/delegate-9.0.25" + sources."@graphql-tools/executor-0.0.13" + (sources."@graphql-tools/executor-graphql-ws-0.0.9" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" ]; }) - sources."@graphql-tools/executor-http-0.1.1" - (sources."@graphql-tools/executor-legacy-ws-0.0.6" // { + (sources."@graphql-tools/executor-http-0.1.4" // { + dependencies = [ + sources."@whatwg-node/fetch-0.6.5" + ]; + }) + (sources."@graphql-tools/executor-legacy-ws-0.0.7" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" ]; }) - sources."@graphql-tools/graphql-file-loader-7.5.14" - sources."@graphql-tools/import-6.7.15" - sources."@graphql-tools/json-file-loader-7.4.15" - sources."@graphql-tools/load-7.8.10" - sources."@graphql-tools/merge-8.3.16" - sources."@graphql-tools/schema-9.0.14" - (sources."@graphql-tools/url-loader-7.17.4" // { + sources."@graphql-tools/graphql-file-loader-7.5.15" + sources."@graphql-tools/import-6.7.16" + sources."@graphql-tools/json-file-loader-7.4.16" + sources."@graphql-tools/load-7.8.11" + sources."@graphql-tools/merge-8.3.17" + sources."@graphql-tools/schema-9.0.15" + (sources."@graphql-tools/url-loader-7.17.9" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" ]; }) - sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.2" + sources."@graphql-tools/utils-9.2.0" + sources."@graphql-tools/wrap-9.3.4" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@jridgewell/resolve-uri-3.1.0" @@ -111572,27 +111079,32 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.9" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/ws-8.5.4" - sources."@whatwg-node/fetch-0.6.2" - sources."abort-controller-3.0.0" + sources."@whatwg-node/events-0.0.2" + (sources."@whatwg-node/fetch-0.6.7" // { + dependencies = [ + sources."@whatwg-node/node-fetch-0.0.3" + ]; + }) + sources."@whatwg-node/node-fetch-0.0.1" sources."accepts-1.3.8" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" @@ -111647,7 +111159,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."cosmiconfig-8.0.0" @@ -111680,7 +111192,6 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-target-shim-5.0.1" sources."eventemitter3-3.1.2" (sources."express-4.16.3" // { dependencies = [ @@ -111699,12 +111210,6 @@ in sources."ms-2.0.0" ]; }) - sources."form-data-encoder-1.7.2" - (sources."formdata-node-4.4.1" // { - dependencies = [ - sources."web-streams-polyfill-4.0.0-beta.3" - ]; - }) sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-extra-8.1.0" @@ -111712,7 +111217,7 @@ in sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."graphql-15.4.0" - sources."graphql-config-4.4.0" + sources."graphql-config-4.4.1" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-16.6.0" @@ -111730,7 +111235,7 @@ in ]; }) sources."graphql-language-service-utils-2.5.1" - sources."graphql-ws-5.11.2" + sources."graphql-ws-5.11.3" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -111787,8 +111292,7 @@ in sources."nextgen-events-1.5.3" sources."nice-try-1.0.5" sources."node-bitmap-0.0.1" - sources."node-domexception-1.0.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" @@ -111870,8 +111374,7 @@ in sources."ts-node-10.9.1" sources."tslib-2.5.0" sources."type-is-1.6.18" - sources."typescript-4.9.4" - sources."undici-5.16.0" + sources."typescript-4.9.5" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" @@ -112021,7 +111524,7 @@ in sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."debug-2.6.9" @@ -112210,7 +111713,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.17.4" + sources."systeminformation-5.17.8" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -112273,7 +111776,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."async-settle-1.0.0" sources."atob-2.1.2" sources."bach-1.2.0" @@ -113151,7 +112654,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."minimatch-3.1.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."safer-buffer-2.1.2" @@ -113431,7 +112934,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1304.0" + sources."aws-sdk-2.1309.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -114020,7 +113523,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" - sources."systeminformation-5.17.4" + sources."systeminformation-5.17.8" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -114050,7 +113553,7 @@ in sources."commander-2.11.0" sources."encoding-0.1.13" sources."iconv-lite-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."source-map-0.7.4" @@ -114132,10 +113635,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.4.tgz"; - sha512 = "iRYwXogGCu9NxWHN5UYqaKeAd9u+MDC8Mhvrwt+stRluSYWjyFqwQGVSuPStW0P8pFgSZ80mOthlA933wKRGKA=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.5.tgz"; + sha512 = "5iU2b84SLE3JOlfGU/g6XCzioEdcflmpHRxPLKEMhEzV43DHgBwbdsTagDtXKtO50hi8osrzA85/HOCglrylKA=="; }; dependencies = [ sources."@azure/abort-controller-1.1.0" @@ -114156,10 +113659,10 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@opentelemetry/api-1.4.0" - sources."@opentelemetry/core-1.9.0" - sources."@opentelemetry/resources-1.9.0" - sources."@opentelemetry/sdk-trace-base-1.9.0" - sources."@opentelemetry/semantic-conventions-1.9.0" + sources."@opentelemetry/core-1.9.1" + sources."@opentelemetry/resources-1.9.1" + sources."@opentelemetry/sdk-trace-base-1.9.1" + sources."@opentelemetry/semantic-conventions-1.9.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -114171,7 +113674,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.10.0" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -114219,7 +113722,7 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-4.3.4" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.1" @@ -114311,11 +113814,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -114325,7 +113824,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."nopt-6.0.0" sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" @@ -114338,7 +113837,7 @@ in sources."picomatch-2.3.1" sources."process-0.11.10" sources."proto-list-1.2.4" - sources."protobufjs-7.1.2" + sources."protobufjs-7.2.1" sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."punycode-2.3.0" @@ -114396,7 +113895,7 @@ in sources."turndown-7.1.1" sources."turndown-plugin-gfm-1.0.2" sources."tweetnacl-0.14.5" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-0.2.0" sources."uri-js-4.4.1" sources."url-parse-1.5.10" @@ -114746,127 +114245,6 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v17.1.0.tar.gz" = nodeEnv.buildNodePackage { - name = "iosevka"; - packageName = "iosevka"; - version = "17.1.0"; - src = fetchurl { - name = "iosevka-17.1.0.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v17.1.0"; - sha256 = "99900713a323b5464c232118237f2ff303dc20d5c2b1b14e4dc93fd5b7df083b"; - }; - dependencies = [ - sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.8.0" - sources."@ot-builder/bin-composite-types-1.6.1" - sources."@ot-builder/bin-util-1.6.1" - sources."@ot-builder/cli-help-shower-1.6.1" - sources."@ot-builder/cli-proc-1.6.1" - sources."@ot-builder/cli-shared-1.6.1" - sources."@ot-builder/common-impl-1.6.1" - sources."@ot-builder/errors-1.6.1" - sources."@ot-builder/io-bin-cff-1.6.1" - sources."@ot-builder/io-bin-encoding-1.6.1" - sources."@ot-builder/io-bin-ext-private-1.6.1" - sources."@ot-builder/io-bin-font-1.6.1" - sources."@ot-builder/io-bin-glyph-store-1.6.1" - sources."@ot-builder/io-bin-layout-1.6.1" - sources."@ot-builder/io-bin-metadata-1.6.1" - sources."@ot-builder/io-bin-metric-1.6.1" - sources."@ot-builder/io-bin-name-1.6.1" - sources."@ot-builder/io-bin-sfnt-1.6.1" - sources."@ot-builder/io-bin-ttf-1.6.1" - sources."@ot-builder/io-bin-vtt-private-1.6.1" - sources."@ot-builder/ot-1.6.1" - sources."@ot-builder/ot-encoding-1.6.1" - sources."@ot-builder/ot-ext-private-1.6.1" - sources."@ot-builder/ot-glyphs-1.6.1" - sources."@ot-builder/ot-layout-1.6.1" - sources."@ot-builder/ot-metadata-1.6.1" - sources."@ot-builder/ot-name-1.6.1" - sources."@ot-builder/ot-sfnt-1.6.1" - sources."@ot-builder/ot-standard-glyph-namer-1.6.1" - sources."@ot-builder/ot-vtt-private-1.6.1" - sources."@ot-builder/prelude-1.6.1" - sources."@ot-builder/primitive-1.6.1" - sources."@ot-builder/rectify-1.6.1" - sources."@ot-builder/stat-glyphs-1.6.1" - sources."@ot-builder/trace-1.6.1" - sources."@ot-builder/var-store-1.6.1" - sources."@ot-builder/variance-1.6.1" - sources."aglfn-1.0.2" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."available-typed-arrays-1.0.5" - sources."call-bind-1.0.2" - sources."chalk-4.1.2" - sources."clipper-lib-6.4.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."deep-equal-2.2.0" - sources."define-properties-1.1.4" - sources."es-get-iterator-1.1.3" - sources."for-each-0.3.3" - sources."function-bind-1.1.1" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.0" - sources."gopd-1.0.1" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."iconv-lite-0.6.3" - sources."internal-slot-1.0.4" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-date-object-1.0.5" - sources."is-map-2.0.2" - sources."is-number-object-1.0.7" - sources."is-regex-1.1.4" - sources."is-set-2.0.2" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" - sources."is-weakmap-2.0.1" - sources."is-weakset-2.0.2" - sources."isarray-2.0.5" - sources."lru-cache-6.0.0" - sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."ot-builder-1.6.1" - sources."otb-ttc-bundle-1.6.1" - sources."regexp.prototype.flags-1.4.3" - sources."safer-buffer-2.1.2" - sources."semver-7.3.8" - sources."side-channel-1.0.4" - sources."spiro-3.0.0" - sources."stop-iteration-iterator-1.0.0" - sources."supports-color-7.2.0" - sources."toposort-2.0.2" - sources."tslib-2.5.0" - sources."typo-geom-0.13.0" - sources."uuid-9.0.0" - sources."wawoff2-2.0.1" - sources."which-boxed-primitive-1.0.2" - sources."which-collection-1.0.1" - sources."which-typed-array-1.1.9" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; @@ -115046,14 +114424,14 @@ in sources."@aws-sdk/abort-controller-3.257.0" sources."@aws-sdk/chunked-blob-reader-3.188.0" sources."@aws-sdk/chunked-blob-reader-native-3.208.0" - (sources."@aws-sdk/client-s3-3.259.0" // { + (sources."@aws-sdk/client-s3-3.264.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/client-sso-3.259.0" - sources."@aws-sdk/client-sso-oidc-3.259.0" - (sources."@aws-sdk/client-sts-3.259.0" // { + sources."@aws-sdk/client-sso-3.264.0" + sources."@aws-sdk/client-sso-oidc-3.264.0" + (sources."@aws-sdk/client-sts-3.264.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; @@ -115061,10 +114439,10 @@ in sources."@aws-sdk/config-resolver-3.259.0" sources."@aws-sdk/credential-provider-env-3.257.0" sources."@aws-sdk/credential-provider-imds-3.259.0" - sources."@aws-sdk/credential-provider-ini-3.259.0" - sources."@aws-sdk/credential-provider-node-3.259.0" + sources."@aws-sdk/credential-provider-ini-3.264.0" + sources."@aws-sdk/credential-provider-node-3.264.0" sources."@aws-sdk/credential-provider-process-3.257.0" - sources."@aws-sdk/credential-provider-sso-3.259.0" + sources."@aws-sdk/credential-provider-sso-3.264.0" sources."@aws-sdk/credential-provider-web-identity-3.257.0" sources."@aws-sdk/eventstream-codec-3.258.0" sources."@aws-sdk/eventstream-serde-browser-3.258.0" @@ -115080,7 +114458,7 @@ in sources."@aws-sdk/md5-js-3.258.0" sources."@aws-sdk/middleware-bucket-endpoint-3.259.0" sources."@aws-sdk/middleware-content-length-3.257.0" - sources."@aws-sdk/middleware-endpoint-3.257.0" + sources."@aws-sdk/middleware-endpoint-3.264.0" sources."@aws-sdk/middleware-expect-continue-3.257.0" sources."@aws-sdk/middleware-flexible-checksums-3.259.0" sources."@aws-sdk/middleware-host-header-3.257.0" @@ -115105,14 +114483,14 @@ in sources."@aws-sdk/protocol-http-3.257.0" sources."@aws-sdk/querystring-builder-3.257.0" sources."@aws-sdk/querystring-parser-3.257.0" - sources."@aws-sdk/s3-request-presigner-3.259.0" + sources."@aws-sdk/s3-request-presigner-3.264.0" sources."@aws-sdk/service-error-classification-3.257.0" sources."@aws-sdk/shared-ini-file-loader-3.257.0" sources."@aws-sdk/signature-v4-3.257.0" - sources."@aws-sdk/signature-v4-crt-3.257.0" - sources."@aws-sdk/signature-v4-multi-region-3.257.0" - sources."@aws-sdk/smithy-client-3.257.0" - sources."@aws-sdk/token-providers-3.259.0" + sources."@aws-sdk/signature-v4-crt-3.264.0" + sources."@aws-sdk/signature-v4-multi-region-3.264.0" + sources."@aws-sdk/smithy-client-3.261.0" + sources."@aws-sdk/token-providers-3.264.0" sources."@aws-sdk/types-3.257.0" sources."@aws-sdk/url-parser-3.257.0" sources."@aws-sdk/util-arn-parser-3.208.0" @@ -115121,9 +114499,9 @@ in sources."@aws-sdk/util-body-length-node-3.208.0" sources."@aws-sdk/util-buffer-from-3.208.0" sources."@aws-sdk/util-config-provider-3.208.0" - sources."@aws-sdk/util-create-request-3.257.0" - sources."@aws-sdk/util-defaults-mode-browser-3.257.0" - sources."@aws-sdk/util-defaults-mode-node-3.259.0" + sources."@aws-sdk/util-create-request-3.261.0" + sources."@aws-sdk/util-defaults-mode-browser-3.261.0" + sources."@aws-sdk/util-defaults-mode-node-3.261.0" sources."@aws-sdk/util-endpoints-3.257.0" sources."@aws-sdk/util-format-url-3.257.0" sources."@aws-sdk/util-hex-encoding-3.201.0" @@ -115178,7 +114556,7 @@ in sources."gauge-3.0.2" sources."is-fullwidth-code-point-3.0.0" sources."mkdirp-1.0.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."npmlog-5.0.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" @@ -115204,7 +114582,7 @@ in }) sources."@tootallnate/once-1.1.2" sources."@types/nanoid-3.0.0" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/ws-8.5.4" sources."abab-2.0.6" sources."abbrev-1.1.1" @@ -115246,13 +114624,13 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-crt-1.15.8" // { + (sources."aws-crt-1.15.9" // { dependencies = [ sources."mkdirp-1.0.4" sources."tar-6.1.13" ]; }) - (sources."aws-sdk-2.1304.0" // { + (sources."aws-sdk-2.1309.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -115297,7 +114675,7 @@ in sources."rimraf-3.0.2" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) ]; @@ -115706,7 +115084,7 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -116205,7 +115583,7 @@ in sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; }; dependencies = [ - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@jsdoc/salty-0.2.3" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" @@ -116457,7 +115835,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" @@ -116622,7 +116000,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -116694,7 +116072,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -117192,10 +116570,11 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.22" - sources."@oclif/config-1.18.6" + sources."@oclif/config-1.18.8" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { dependencies = [ + sources."@oclif/config-1.18.6" sources."wrap-ansi-6.2.0" ]; }) @@ -117447,7 +116826,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -117467,7 +116846,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."connect-3.7.0" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" @@ -117655,7 +117034,7 @@ in sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" sources."@babel/node-7.20.7" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/register-7.18.9" @@ -117759,13 +117138,13 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."canvas-2.11.0" sources."chalk-2.4.2" sources."chardet-1.5.1" @@ -117783,7 +117162,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" @@ -117826,7 +117205,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -118003,11 +117382,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -118023,7 +117398,7 @@ in sources."negotiator-0.6.3" sources."node-abi-2.30.1" sources."node-environment-flags-1.0.6" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."node-notifier-10.0.1" // { dependencies = [ @@ -118032,7 +117407,7 @@ in sources."yallist-4.0.0" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."number-is-nan-1.0.1" @@ -118223,7 +117598,7 @@ in sources."uuid-8.3.2" sources."v8flags-3.2.0" sources."valid-url-1.0.9" - sources."validator-13.7.0" + sources."validator-13.9.0" sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" @@ -119026,24 +118401,24 @@ in sources."@swc-node/core-1.9.2" sources."@swc-node/register-1.5.5" sources."@swc-node/sourcemap-support-0.2.3" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" sources."@tootallnate/once-2.0.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@yarnpkg/lockfile-1.1.0" - (sources."@yarnpkg/parsers-3.0.0-rc.36" // { + (sources."@yarnpkg/parsers-3.0.0-rc.38" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -119075,7 +118450,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."axios-1.2.6" + sources."axios-1.3.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -119415,7 +118790,7 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-9.3.1" sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" @@ -119610,7 +118985,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."tar-stream-2.2.0" @@ -119632,7 +119007,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uglify-js-3.17.4" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -119762,7 +119137,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -120095,7 +119470,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -120153,7 +119528,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -120661,7 +120036,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -121141,7 +120516,7 @@ in ]; }) sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.0.0" sources."@babel/plugin-proposal-json-strings-7.18.6" @@ -121158,7 +120533,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-block-scoping-7.20.15" sources."@babel/plugin-transform-classes-7.20.7" (sources."@babel/plugin-transform-computed-properties-7.20.7" // { dependencies = [ @@ -121276,7 +120651,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."atob-2.1.2" (sources."autodll-webpack-plugin-0.4.2" // { dependencies = [ @@ -121339,7 +120714,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" @@ -121352,7 +120727,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -121439,7 +120814,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -121751,7 +121126,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."resolve-1.22.1" @@ -121915,7 +121290,7 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."slash-1.0.0" @@ -122558,7 +121933,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-3.2.1" @@ -122617,8 +121992,8 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-19.6.2" - sources."puppeteer-core-19.6.2" + sources."puppeteer-19.6.3" + sources."puppeteer-core-19.6.3" sources."readable-stream-3.6.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" @@ -122878,7 +122253,7 @@ in sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -122976,7 +122351,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" @@ -123149,7 +122524,7 @@ in sources."near-seed-phrase-0.2.0" sources."node-abi-3.31.0" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."node-hid-2.1.2" sources."normalize-url-4.5.1" @@ -123449,7 +122824,7 @@ in sources."strip-ansi-6.0.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" ]; }) sources."unique-filename-2.0.1" @@ -123535,7 +122910,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -123905,6 +123280,7 @@ in sources."@node-red/editor-client-3.0.2" (sources."@node-red/nodes-3.0.2" // { dependencies = [ + sources."content-type-1.0.4" sources."cookie-0.5.0" sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" @@ -123918,7 +123294,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -123984,7 +123360,7 @@ in sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" (sources."cookie-parser-1.4.6" // { dependencies = [ @@ -124158,7 +123534,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."node-red-admin-3.0.0" sources."node-watch-0.7.3" @@ -124375,7 +123751,7 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -124586,7 +123962,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -125080,10 +124456,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.4.0.tgz"; - sha512 = "eT/yB9VFgnqJjMZN++RDcKPyuvEl3iM//bfJzAa3F9+x9l/x8XJUYnHAy0K6ep4JVNTxCUAp/wgy0pBicTZr5A=="; + url = "https://registry.npmjs.org/npm/-/npm-9.4.1.tgz"; + sha512 = "yCtrPwN/vPtc2KRyIBLdTqPMFy0R9pPurr8wJKtDvDfzICY/3IBG6t2z+zHA79pl5R8+mVH8EcJICLUeU48oQQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -125098,10 +124474,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.6.3"; + version = "16.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.3.tgz"; - sha512 = "EKhsCbBcVrPlYKzaYQtRhGv9fxpexwROcvl5HebCUNpiCSlOWrzaJvrMlwi9i9GCyJCnH+YAeBPYdqnArA390A=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.4.tgz"; + sha512 = "YZ99u6l7GFG5y1/XapEqlMwUWVEJfwXbOsf6SU5X1YuKEHpWbC+98cL/F7TALKjVAMwOrx43WopeBspatxh/Kw=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -125154,7 +124530,7 @@ in ]; }) sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.6" sources."camelcase-7.0.1" sources."chalk-5.2.0" sources."chownr-2.0.0" @@ -125208,7 +124584,7 @@ in sources."find-up-5.0.0" sources."form-data-encoder-2.1.4" sources."fp-and-or-0.1.3" - sources."fs-minipass-3.0.0" + sources."fs-minipass-3.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-4.0.4" @@ -125292,7 +124668,7 @@ in sources."mimic-response-4.0.0" sources."minimatch-5.1.6" sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -125355,7 +124731,7 @@ in sources."npm-pick-manifest-8.0.1" (sources."npm-registry-fetch-14.0.3" // { dependencies = [ - sources."make-fetch-happen-11.0.2" + sources."make-fetch-happen-11.0.3" sources."minipass-fetch-3.0.1" ]; }) @@ -125640,7 +125016,7 @@ in sources."@apidevtools/openapi-schemas-2.1.0" sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" - sources."@asyncapi/specs-3.2.1" + sources."@asyncapi/specs-4.1.0" sources."@esbuild/android-arm-0.15.18" sources."@esbuild/linux-loong64-0.15.18" sources."@exodus/schemasafe-1.0.0-rc.9" @@ -125678,31 +125054,31 @@ in sources."fast-glob-3.2.7" ]; }) - (sources."@stoplight/spectral-core-1.16.0" // { + (sources."@stoplight/spectral-core-1.16.1" // { dependencies = [ sources."@stoplight/types-13.6.0" ]; }) - sources."@stoplight/spectral-formats-1.4.0" + sources."@stoplight/spectral-formats-1.5.0" sources."@stoplight/spectral-functions-1.7.2" sources."@stoplight/spectral-parsers-1.0.2" sources."@stoplight/spectral-ref-resolver-1.0.2" sources."@stoplight/spectral-ruleset-bundler-1.5.0" sources."@stoplight/spectral-ruleset-migrator-1.9.1" - sources."@stoplight/spectral-rulesets-1.14.1" + sources."@stoplight/spectral-rulesets-1.15.0" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" ]; }) - sources."@stoplight/types-13.8.0" + sources."@stoplight/types-13.9.0" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" sources."@tootallnate/once-1.1.2" sources."@types/es-aggregate-error-1.0.2" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.2" @@ -125936,7 +125312,7 @@ in sources."jsonpath-plus-6.0.1" ]; }) - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" sources."normalize-path-3.0.0" @@ -126042,7 +125418,7 @@ in sources."tslib-2.5.0" sources."type-check-0.3.2" sources."typed-array-length-1.0.4" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -126050,8 +125426,8 @@ in sources."urijs-1.19.11" sources."utility-types-3.10.0" sources."validate-npm-package-name-3.0.0" - sources."validator-13.7.0" - sources."vm2-3.9.13" + sources."validator-13.9.0" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -126137,7 +125513,7 @@ in sources."@babel/helper-wrap-function-7.20.5" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" 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.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -126175,7 +125551,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-block-scoping-7.20.15" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -126274,7 +125650,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -126331,7 +125707,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -126348,7 +125724,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -126481,7 +125857,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -126599,7 +125975,7 @@ in sources."acorn-8.8.2" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" - sources."terser-5.16.1" + sources."terser-5.16.3" ]; }) (sources."htmlparser2-6.1.0" // { @@ -126759,7 +126135,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -127166,12 +126542,12 @@ in sources."@lmdb/lmdb-linux-x64-2.5.2" sources."@lmdb/lmdb-win32-x64-2.5.2" sources."@mischnic/json-sourcemap-0.1.0" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.0" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.0" sources."@parcel/bundler-default-2.8.3" sources."@parcel/cache-2.8.3" sources."@parcel/codeframe-2.8.3" @@ -127267,11 +126643,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -127320,7 +126696,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -127399,13 +126775,17 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."msgpackr-1.8.2" - sources."msgpackr-extract-2.2.0" + sources."msgpackr-1.8.3" + (sources."msgpackr-extract-3.0.0" // { + dependencies = [ + sources."node-gyp-build-optional-packages-5.0.7" + ]; + }) sources."nanoid-3.3.4" sources."node-addon-api-4.3.0" sources."node-gyp-build-4.6.0" sources."node-gyp-build-optional-packages-5.0.3" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-url-6.1.0" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" @@ -127489,7 +126869,7 @@ in sources."svgo-2.8.0" sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.3" // { dependencies = [ sources."commander-2.20.3" ]; @@ -127583,7 +126963,7 @@ in (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" - sources."content-type-1.0.4" + sources."content-type-1.0.5" ]; }) sources."brace-expansion-1.1.11" @@ -127636,7 +127016,7 @@ in sources."etag-1.8.1" (sources."express-4.18.2" // { dependencies = [ - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."safe-buffer-5.2.1" ]; }) @@ -128320,7 +127700,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -128739,7 +128119,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-notifier-10.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -129023,7 +128403,7 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.17.4" + sources."systeminformation-5.17.8" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.5.0" @@ -129039,7 +128419,7 @@ in sources."async-2.6.4" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -129060,10 +128440,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.26.1"; + version = "7.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.26.1.tgz"; - sha512 = "l86ZNy8RZmG2aDxZVk6+vt9c8aV0tMZICQxPksRQOL5r2n92kgaIauYSFUZ+LNmPJFsbSGKpsvgOF41oiS7JWw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.26.3.tgz"; + sha512 = "Q/McJBmWoVmHMn5Nzf8Ty3gCPeOqq4fFbIP07Cg4Ygkvk01yu9LdXagydEHuvYIq0c/yU9+7EKeppUuuw1OX6Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -129142,23 +128522,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.29" - sources."@swc/core-darwin-arm64-1.3.29" - sources."@swc/core-darwin-x64-1.3.29" - sources."@swc/core-linux-arm-gnueabihf-1.3.29" - sources."@swc/core-linux-arm64-gnu-1.3.29" - sources."@swc/core-linux-arm64-musl-1.3.29" - sources."@swc/core-linux-x64-gnu-1.3.29" - sources."@swc/core-linux-x64-musl-1.3.29" - sources."@swc/core-win32-arm64-msvc-1.3.29" - sources."@swc/core-win32-ia32-msvc-1.3.29" - sources."@swc/core-win32-x64-msvc-1.3.29" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" @@ -129225,7 +128605,7 @@ in sources."thenby-1.3.4" sources."to-regex-range-5.0.1" sources."ts-node-10.9.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."v8-compile-cache-lib-3.0.1" sources."wrap-ansi-7.0.0" @@ -129428,7 +128808,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" @@ -129449,10 +128829,10 @@ in sources."argparse-1.0.10" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -129465,7 +128845,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -129519,7 +128899,7 @@ in sources."minimatch-3.1.2" sources."ms-2.1.2" sources."node-preload-0.2.1" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."nyc-15.1.0" sources."once-1.4.0" sources."p-limit-2.3.0" @@ -129849,7 +129229,7 @@ in sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."simple-concat-1.0.1" sources."sorcery-0.10.0" sources."source-map-0.5.7" @@ -129916,7 +129296,7 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."uuid-3.4.0" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" @@ -130098,10 +129478,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.291"; + version = "1.1.292"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; - sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.292.tgz"; + sha512 = "qwNT2mBKiZXSzVckHkyuCoyrKa8CXh6o4xH7PL/+jeIdiv+a5ljfkxPvIEm6Stln8YEU/tnQb8xODUtgKsu5YA=="; }; buildInputs = globalBuildInputs; meta = { @@ -130116,10 +129496,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "21.0.4"; + version = "21.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-21.0.4.tgz"; - sha512 = "zpmXft8rIemnKKA/aNmwUk21QY5GDRSNJegD3ESPBAVt1/V40lsZDF3h1oYqjYCawOjEpPOizYaxMMNhbVEL3w=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-21.0.9.tgz"; + sha512 = "Ab0mUKA78+5vK49C0+axPTd4gCauLyEhs7SE3fyk08vUvHHUk5FnDSua1KKDE6Kbf6CReO+vG1hcnf6uxQt0Wg=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -130128,24 +129508,24 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" sources."@mark.probst/typescript-json-schema-0.55.0" - sources."@swc/core-1.3.30" - sources."@swc/core-darwin-arm64-1.3.30" - sources."@swc/core-darwin-x64-1.3.30" - sources."@swc/core-linux-arm-gnueabihf-1.3.30" - sources."@swc/core-linux-arm64-gnu-1.3.30" - sources."@swc/core-linux-arm64-musl-1.3.30" - sources."@swc/core-linux-x64-gnu-1.3.30" - sources."@swc/core-linux-x64-musl-1.3.30" - sources."@swc/core-win32-arm64-msvc-1.3.30" - sources."@swc/core-win32-ia32-msvc-1.3.30" - sources."@swc/core-win32-x64-msvc-1.3.30" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" - sources."@types/node-16.18.11" + sources."@types/node-16.18.12" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.2" @@ -130201,7 +129581,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-url-1.2.4" sources."iterall-1.1.3" - sources."js-base64-2.6.4" + sources."js-base64-3.7.4" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."make-error-1.3.6" @@ -130214,9 +129594,9 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - sources."quicktype-core-21.0.4" - sources."quicktype-graphql-input-21.0.4" - sources."quicktype-typescript-input-21.0.4" + sources."quicktype-core-21.0.9" + sources."quicktype-graphql-input-21.0.9" + sources."quicktype-typescript-input-21.0.9" sources."readable-stream-4.3.0" sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" @@ -130441,7 +129821,7 @@ in sources."@babel/helper-wrap-function-7.20.5" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" 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.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -130480,7 +129860,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-block-scoping-7.20.15" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -130541,7 +129921,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" @@ -130614,7 +129994,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."async-limiter-1.0.1" sources."atob-2.1.2" (sources."autoprefixer-9.8.8" // { @@ -130702,7 +130082,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -130732,7 +130112,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -130802,7 +130182,7 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" @@ -130953,7 +130333,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -131403,7 +130783,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -132345,7 +131725,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -132354,7 +131734,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - (sources."node-fetch-2.6.8" // { + (sources."node-fetch-2.6.9" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -132447,7 +131827,7 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" sources."@babel/traverse-7.20.13" @@ -132464,10 +131844,10 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@redocly/ajv-8.11.0" - sources."@redocly/openapi-core-1.0.0-beta.122" + sources."@redocly/openapi-core-1.0.0-beta.123" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" @@ -132541,7 +131921,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -132559,7 +131939,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" (sources."chalk-2.4.2" // { dependencies = [ sources."has-flag-3.0.0" @@ -132610,7 +131990,7 @@ in sources."dompurify-2.4.3" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -132733,11 +132113,11 @@ in sources."mobx-react-lite-3.4.0" sources."ms-2.1.2" sources."neo-async-2.6.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.9" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."oas-kit-common-1.0.8" @@ -132854,7 +132234,7 @@ in sources."supports-color-8.1.1" sources."swagger2openapi-7.0.8" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.3" sources."terser-webpack-plugin-5.3.6" sources."timers-browserify-2.0.12" sources."to-arraybuffer-1.0.1" @@ -133149,7 +132529,7 @@ in sources."concat-stream-1.6.2" sources."configstore-5.0.1" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -133423,10 +132803,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.12.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.12.0.tgz"; - sha512 = "4MZ8kA2HNYahIjz63rzrMMRvDqQDeS9LoriJvMuV0V6zIGysP36e9t4yObUfwdT9h/szXoHQideICftcdZklWg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.14.0.tgz"; + sha512 = "o23sdgCLcLSe3zIplT9nQ1+r97okuaiR+vmAPZPTDYB7/f3tgWIYNyiQveMsZwshBT0is4eGax/HH83Q7CG+/Q=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -133460,15 +132840,15 @@ in sources."@types/node-14.17.34" sources."@types/semver-7.3.13" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.49.0" - sources."@typescript-eslint/parser-5.49.0" - sources."@typescript-eslint/scope-manager-5.49.0" - sources."@typescript-eslint/type-utils-5.49.0" - sources."@typescript-eslint/types-5.49.0" - sources."@typescript-eslint/typescript-estree-5.49.0" - sources."@typescript-eslint/utils-5.49.0" - sources."@typescript-eslint/visitor-keys-5.49.0" - sources."@vscode/test-electron-2.2.2" + sources."@typescript-eslint/eslint-plugin-5.50.0" + sources."@typescript-eslint/parser-5.50.0" + sources."@typescript-eslint/scope-manager-5.50.0" + sources."@typescript-eslint/type-utils-5.50.0" + sources."@typescript-eslint/types-5.50.0" + sources."@typescript-eslint/typescript-estree-5.50.0" + sources."@typescript-eslint/utils-5.50.0" + sources."@typescript-eslint/visitor-keys-5.50.0" + sources."@vscode/test-electron-2.2.3" sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" @@ -133585,7 +132965,7 @@ in sources."entities-4.4.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.32.0" // { + (sources."eslint-8.33.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -133778,7 +133158,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.9" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.6" @@ -133949,10 +133329,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.57.1"; + version = "1.58.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; - sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz"; + sha512 = "PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -133962,7 +133342,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."glob-parent-5.1.2" - sources."immutable-4.2.2" + sources."immutable-4.2.3" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -134174,7 +133554,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.191" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -134202,7 +133582,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1304.0" // { + (sources."aws-sdk-2.1309.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -134489,7 +133869,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -134503,7 +133883,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -134707,7 +134087,7 @@ in sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -135303,10 +134683,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1091.0"; + version = "1.1096.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1091.0.tgz"; - sha512 = "NUofOS3cf4KoT0V3vS1NDC86eG86L29SIno8yIMiVvW7azOxw/IgO09oUhKzFUMXixzU0I9z6Ja+Uv0JsrMQnw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1096.0.tgz"; + sha512 = "sdlaejAJQE6Ka1P2x5nwRkCmkBCLmo/0W+B1BJZVlt53RMSer/MCLVqKf7sSeSXdfBoQnnskJVYQ3qMMWzl2pA=="; }; buildInputs = globalBuildInputs; meta = { @@ -135329,7 +134709,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.7" @@ -135585,7 +134965,7 @@ in sources."push-stream-11.2.0" ]; }) - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" @@ -136599,7 +135979,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1304.0" // { + (sources."aws-sdk-2.1309.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -136681,7 +136061,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-to-ecmascript-compatible-varname-0.1.5" sources."cookie-0.4.0" (sources."cookie-session-2.0.0" // { @@ -137775,7 +137155,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" @@ -137792,23 +137172,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.30" - sources."@swc/core-darwin-arm64-1.3.30" - sources."@swc/core-darwin-x64-1.3.30" - sources."@swc/core-linux-arm-gnueabihf-1.3.30" - sources."@swc/core-linux-arm64-gnu-1.3.30" - sources."@swc/core-linux-arm64-musl-1.3.30" - sources."@swc/core-linux-x64-gnu-1.3.30" - sources."@swc/core-linux-x64-musl-1.3.30" - sources."@swc/core-win32-arm64-msvc-1.3.30" - sources."@swc/core-win32-ia32-msvc-1.3.30" - sources."@swc/core-win32-x64-msvc-1.3.30" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."acorn-8.8.2" @@ -137824,11 +137204,11 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -137846,7 +137226,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -137869,7 +137249,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.2.2" + sources."immutable-4.2.3" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -137916,7 +137296,7 @@ in sources."debug-3.2.7" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -137953,7 +137333,7 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.57.1" + sources."sass-1.58.0" sources."sax-1.2.4" sources."semver-6.3.0" sources."sorcery-0.11.0" @@ -137979,7 +137359,7 @@ in sources."token-stream-1.0.0" sources."ts-node-10.9.1" sources."tslib-2.5.0" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" @@ -138030,7 +137410,7 @@ in sources."@babel/helper-validator-option-7.18.6" sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/template-7.20.7" sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" @@ -138050,23 +137430,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.30" - sources."@swc/core-darwin-arm64-1.3.30" - sources."@swc/core-darwin-x64-1.3.30" - sources."@swc/core-linux-arm-gnueabihf-1.3.30" - sources."@swc/core-linux-arm64-gnu-1.3.30" - sources."@swc/core-linux-arm64-musl-1.3.30" - sources."@swc/core-linux-x64-gnu-1.3.30" - sources."@swc/core-linux-x64-musl-1.3.30" - sources."@swc/core-win32-arm64-msvc-1.3.30" - sources."@swc/core-win32-ia32-msvc-1.3.30" - sources."@swc/core-win32-x64-msvc-1.3.30" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" (sources."@vscode/emmet-helper-2.8.6" // { @@ -138088,10 +137468,10 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138110,7 +137490,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."emmet-2.3.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -138135,7 +137515,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.2.2" + sources."immutable-4.2.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -138184,7 +137564,7 @@ in ]; }) sources."no-case-3.0.4" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -138221,7 +137601,7 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.57.1" + sources."sass-1.58.0" sources."sax-1.2.4" sources."semver-6.3.0" sources."sorcery-0.11.0" @@ -138242,13 +137622,13 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" sources."svelte-preprocess-5.0.1" - sources."svelte2tsx-0.6.0" + sources."svelte2tsx-0.6.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" sources."tslib-2.5.0" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" @@ -138346,7 +137726,7 @@ in sources."asap-2.0.6" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.4" + sources."async-each-1.0.6" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" @@ -138430,7 +137810,7 @@ in sources."concat-stream-1.6.2" sources."configstore-3.1.5" sources."connect-3.7.0" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookiejar-2.1.4" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" @@ -138992,23 +138372,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.30" - sources."@swc/core-darwin-arm64-1.3.30" - sources."@swc/core-darwin-x64-1.3.30" - sources."@swc/core-linux-arm-gnueabihf-1.3.30" - sources."@swc/core-linux-arm64-gnu-1.3.30" - sources."@swc/core-linux-arm64-musl-1.3.30" - sources."@swc/core-linux-x64-gnu-1.3.30" - sources."@swc/core-linux-x64-musl-1.3.30" - sources."@swc/core-win32-arm64-msvc-1.3.30" - sources."@swc/core-win32-ia32-msvc-1.3.30" - sources."@swc/core-win32-x64-msvc-1.3.30" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -139082,7 +138462,7 @@ in sources."arg-4.1.3" ]; }) - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -139220,7 +138600,7 @@ in sources."nan-2.17.0" sources."needle-2.9.1" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."node-opus-0.2.9" // { dependencies = [ @@ -139427,10 +138807,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.16.1"; + version = "5.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; - sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz"; + sha512 = "v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -139458,30 +138838,30 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "13.0.4"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; - sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.1.4.tgz"; + sha512 = "/+CkTaqQWSzBRBGtZDxpjmFsOo9fYtswW8RNrUnK7piQ+6MDFQ4+wydh5hzCRQi1L5L2gRmj+uOALFqn7LuhDg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-13.0.4" - sources."@textlint/ast-tester-13.0.4" - sources."@textlint/ast-traverse-13.0.4" - sources."@textlint/config-loader-13.0.4" - sources."@textlint/feature-flag-13.0.4" - sources."@textlint/fixer-formatter-13.0.4" - sources."@textlint/kernel-13.0.4" - sources."@textlint/linter-formatter-13.0.4" - sources."@textlint/markdown-to-ast-13.0.4" - sources."@textlint/module-interop-13.0.4" - sources."@textlint/source-code-fixer-13.0.4" - sources."@textlint/text-to-ast-13.0.4" - sources."@textlint/textlint-plugin-markdown-13.0.4" - sources."@textlint/textlint-plugin-text-13.0.4" - sources."@textlint/types-13.0.4" - sources."@textlint/utils-13.0.4" + sources."@textlint/ast-node-types-13.1.4" + sources."@textlint/ast-tester-13.1.4" + sources."@textlint/ast-traverse-13.1.4" + sources."@textlint/config-loader-13.1.4" + sources."@textlint/feature-flag-13.1.4" + sources."@textlint/fixer-formatter-13.1.4" + sources."@textlint/kernel-13.1.4" + sources."@textlint/linter-formatter-13.1.4" + sources."@textlint/markdown-to-ast-13.1.4" + sources."@textlint/module-interop-13.1.4" + sources."@textlint/source-code-fixer-13.1.4" + sources."@textlint/text-to-ast-13.1.4" + sources."@textlint/textlint-plugin-markdown-13.1.4" + sources."@textlint/textlint-plugin-text-13.1.4" + sources."@textlint/types-13.1.4" + sources."@textlint/utils-13.1.4" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.12.0" @@ -139735,7 +139115,7 @@ in sources."@babel/highlight-7.18.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" sources."@types/hast-2.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -140188,25 +139568,25 @@ in sources."@textlint/ast-node-types-12.6.1" ]; }) - (sources."@textlint/config-loader-13.0.4" // { + (sources."@textlint/config-loader-13.1.4" // { dependencies = [ - sources."@textlint/ast-node-types-13.0.4" - sources."@textlint/ast-tester-13.0.4" - sources."@textlint/ast-traverse-13.0.4" - sources."@textlint/feature-flag-13.0.4" - sources."@textlint/kernel-13.0.4" - sources."@textlint/source-code-fixer-13.0.4" - sources."@textlint/types-13.0.4" - sources."@textlint/utils-13.0.4" + sources."@textlint/ast-node-types-13.1.4" + sources."@textlint/ast-tester-13.1.4" + sources."@textlint/ast-traverse-13.1.4" + sources."@textlint/feature-flag-13.1.4" + sources."@textlint/kernel-13.1.4" + sources."@textlint/source-code-fixer-13.1.4" + sources."@textlint/types-13.1.4" + sources."@textlint/utils-13.1.4" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; }) sources."@textlint/feature-flag-12.6.1" - (sources."@textlint/fixer-formatter-13.0.4" // { + (sources."@textlint/fixer-formatter-13.1.4" // { dependencies = [ - sources."@textlint/ast-node-types-13.0.4" - sources."@textlint/types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" + sources."@textlint/types-13.1.4" ]; }) (sources."@textlint/kernel-12.6.1" // { @@ -140216,10 +139596,10 @@ in sources."structured-source-4.0.0" ]; }) - (sources."@textlint/linter-formatter-13.0.4" // { + (sources."@textlint/linter-formatter-13.1.4" // { dependencies = [ - sources."@textlint/ast-node-types-13.0.4" - sources."@textlint/types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" + sources."@textlint/types-13.1.4" ]; }) (sources."@textlint/markdown-to-ast-12.6.1" // { @@ -140227,7 +139607,7 @@ in sources."@textlint/ast-node-types-12.6.1" ]; }) - sources."@textlint/module-interop-13.0.4" + sources."@textlint/module-interop-13.1.4" sources."@textlint/source-code-fixer-12.6.1" (sources."@textlint/text-to-ast-12.6.1" // { dependencies = [ @@ -140243,7 +139623,6 @@ in }) sources."@textlint/utils-12.6.1" sources."@types/mdast-3.0.10" - sources."@types/structured-source-3.0.0" sources."@types/unist-2.0.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -140431,27 +139810,30 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" sources."text-table-0.2.0" - (sources."textlint-13.0.4" // { + (sources."textlint-13.1.4" // { dependencies = [ - sources."@textlint/ast-node-types-13.0.4" - sources."@textlint/ast-tester-13.0.4" - sources."@textlint/ast-traverse-13.0.4" - sources."@textlint/feature-flag-13.0.4" - sources."@textlint/kernel-13.0.4" - sources."@textlint/markdown-to-ast-13.0.4" - sources."@textlint/source-code-fixer-13.0.4" - sources."@textlint/text-to-ast-13.0.4" - sources."@textlint/textlint-plugin-markdown-13.0.4" - sources."@textlint/textlint-plugin-text-13.0.4" - sources."@textlint/types-13.0.4" - sources."@textlint/utils-13.0.4" + sources."@textlint/ast-node-types-13.1.4" + sources."@textlint/ast-tester-13.1.4" + sources."@textlint/ast-traverse-13.1.4" + sources."@textlint/feature-flag-13.1.4" + sources."@textlint/kernel-13.1.4" + sources."@textlint/markdown-to-ast-13.1.4" + sources."@textlint/source-code-fixer-13.1.4" + sources."@textlint/text-to-ast-13.1.4" + sources."@textlint/textlint-plugin-markdown-13.1.4" + sources."@textlint/textlint-plugin-text-13.1.4" + sources."@textlint/types-13.1.4" + sources."@textlint/utils-13.1.4" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; }) sources."textlint-tester-12.6.1" - (sources."textlint-util-to-string-3.1.1" // { + (sources."textlint-util-to-string-3.2.0" // { dependencies = [ + sources."@textlint/ast-node-types-13.1.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" sources."unified-8.4.2" ]; }) @@ -140498,7 +139880,6 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" - sources."@types/structured-source-3.0.0" sources."@types/unist-2.0.6" sources."bail-1.0.5" sources."boundary-1.0.1" @@ -140523,7 +139904,13 @@ in sources."space-separated-tokens-1.1.5" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" - sources."textlint-util-to-string-3.1.1" + (sources."textlint-util-to-string-3.2.0" // { + dependencies = [ + sources."@textlint/ast-node-types-13.1.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" + ]; + }) sources."trough-1.0.5" sources."typedarray-0.0.6" sources."unified-8.4.2" @@ -140570,7 +139957,7 @@ in sources."structured-source-3.0.2" (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -140622,7 +140009,7 @@ in sha512 = "gO4N3OnPLvE6+fvJ1Y5m8MzDVrqMEWzW8pTGMXjL8VAXmQkD6YQ9eDMbsVN0/DzEe8tcsBqNgA/iIrQ64oECuQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" @@ -140652,7 +140039,7 @@ in sha512 = "obQ3y0hqX6OWCrM8K5K6WSJGE4BOyNfGF6hUGPet56taTm/xzkRu8XA6vpn2GFr4zom/oMa0sBJ3OtDWCgrS/g=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" @@ -140768,7 +140155,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-node-types-13.1.4" sources."@types/json5-0.0.29" sources."@types/unist-2.0.6" sources."acorn-8.8.2" @@ -140812,7 +140199,7 @@ in sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.32.0" // { + (sources."eslint-8.33.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -140823,7 +140210,7 @@ in sources."eslint-module-utils-2.7.4" sources."eslint-plugin-import-2.27.5" sources."eslint-plugin-jsx-a11y-6.7.1" - (sources."eslint-plugin-react-7.32.1" // { + (sources."eslint-plugin-react-7.32.2" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -141016,7 +140403,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -141073,7 +140460,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-js-3.27.2" @@ -141232,7 +140619,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -141243,7 +140630,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -141418,7 +140805,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -141475,7 +140862,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-js-3.27.2" @@ -141634,7 +141021,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -141645,7 +141032,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -141893,7 +141280,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-3.27.2" @@ -142490,7 +141877,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -142568,7 +141955,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-3.27.2" @@ -142958,7 +142345,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143036,7 +142423,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-3.27.2" @@ -143857,7 +143244,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.6" sources."ajv-6.12.6" @@ -144235,7 +143622,7 @@ in sources."supports-color-2.0.0" sources."temp-0.8.4" sources."tslib-1.14.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" ]; @@ -144262,30 +143649,30 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.30" - sources."@swc/core-darwin-arm64-1.3.30" - sources."@swc/core-darwin-x64-1.3.30" - sources."@swc/core-linux-arm-gnueabihf-1.3.30" - sources."@swc/core-linux-arm64-gnu-1.3.30" - sources."@swc/core-linux-arm64-musl-1.3.30" - sources."@swc/core-linux-x64-gnu-1.3.30" - sources."@swc/core-linux-x64-musl-1.3.30" - sources."@swc/core-win32-arm64-msvc-1.3.30" - sources."@swc/core-win32-ia32-msvc-1.3.30" - sources."@swc/core-win32-x64-msvc-1.3.30" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" sources."make-error-1.3.6" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" ]; @@ -144323,10 +143710,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; buildInputs = globalBuildInputs; meta = { @@ -144341,10 +143728,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.3.tgz"; - sha512 = "7FQOXbyWQOnRmOujX/Td2/mBICLuDaVdecALzwx5x7CreV5/GL8+o1KLIMvS7D3/OShV0CiRGmkNmF3Y5L/pdg=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.1.0.tgz"; + sha512 = "tc3kUTDEGOMKc96JKQrP3edRx42FzgpPXgUcmHoFJ+6Phgdt101Z9kypD6nxPX4kE7F6xBj/U9Caltf/uttAMA=="; }; buildInputs = globalBuildInputs; meta = { @@ -144411,7 +143798,7 @@ in sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.11" + sources."@types/node-16.18.12" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -144469,7 +143856,7 @@ in sources."builtin-status-codes-3.0.0" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.6" sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."cipher-base-1.0.4" @@ -144491,7 +143878,7 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" @@ -144762,7 +144149,7 @@ in sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shasum-object-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signals-1.0.0" sources."simple-concat-1.0.1" @@ -144833,7 +144220,7 @@ in sources."tty-browserify-0.0.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uid-safe-2.1.5" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -144892,14 +144279,14 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@npmcli/config-6.1.1" + sources."@npmcli/config-6.1.2" sources."@npmcli/map-workspaces-3.0.1" sources."@npmcli/name-from-folder-2.0.0" sources."@types/concat-stream-2.0.0" sources."@types/debug-4.1.7" sources."@types/is-empty-1.2.1" sources."@types/ms-0.7.31" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" @@ -144969,7 +144356,7 @@ in sources."util-deprecate-1.0.2" sources."vfile-5.3.6" sources."vfile-message-3.1.3" - (sources."vfile-reporter-7.0.4" // { + (sources."vfile-reporter-7.0.5" // { dependencies = [ sources."supports-color-9.3.1" ]; @@ -145075,7 +144462,7 @@ in }) sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -145084,7 +144471,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."object-assign-4.1.1" @@ -145214,7 +144601,7 @@ in sources."internmap-2.0.3" sources."is-fullwidth-code-point-3.0.0" sources."json-stringify-pretty-compact-3.0.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."require-directory-2.1.1" sources."robust-predicates-3.0.1" sources."rw-1.3.3" @@ -145282,10 +144669,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.14.0"; + version = "28.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.14.0.tgz"; - sha512 = "WMAWwJpj7zxPyMpnpEB4ofsu6ERvjXxzjtsd7AfzNBrgRZ88yBZ3yW5vKHPTVnEtJX8BvGq5o5lBQJOKlm2nfg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.15.0.tgz"; + sha512 = "v5cc1XZ/neXsa30l0S5t665DG8BlXmBcHZ8YEIJXUu5RGaee0dAdWn/H85ThFLybDjcqg6KCDcQjyKDS5HIGZg=="; }; dependencies = [ sources."@babel/runtime-7.12.1" @@ -145293,28 +144680,6 @@ in sources."@edge-runtime/format-1.1.0" sources."@edge-runtime/primitives-2.0.0" sources."@edge-runtime/vm-2.0.0" - sources."@esbuild/android-arm-0.16.17" - sources."@esbuild/android-arm64-0.16.17" - sources."@esbuild/android-x64-0.16.17" - sources."@esbuild/darwin-arm64-0.16.17" - sources."@esbuild/darwin-x64-0.16.17" - sources."@esbuild/freebsd-arm64-0.16.17" - sources."@esbuild/freebsd-x64-0.16.17" - sources."@esbuild/linux-arm-0.16.17" - sources."@esbuild/linux-arm64-0.16.17" - sources."@esbuild/linux-ia32-0.16.17" - sources."@esbuild/linux-loong64-0.16.17" - sources."@esbuild/linux-mips64el-0.16.17" - sources."@esbuild/linux-ppc64-0.16.17" - sources."@esbuild/linux-riscv64-0.16.17" - sources."@esbuild/linux-s390x-0.16.17" - sources."@esbuild/linux-x64-0.16.17" - sources."@esbuild/netbsd-x64-0.16.17" - sources."@esbuild/openbsd-x64-0.16.17" - sources."@esbuild/sunos-x64-0.16.17" - sources."@esbuild/win32-arm64-0.16.17" - sources."@esbuild/win32-ia32-0.16.17" - sources."@esbuild/win32-x64-0.16.17" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" @@ -145327,18 +144692,18 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" - sources."@swc/core-1.3.30" - sources."@swc/core-darwin-arm64-1.3.30" - sources."@swc/core-darwin-x64-1.3.30" - sources."@swc/core-linux-arm-gnueabihf-1.3.30" - sources."@swc/core-linux-arm64-gnu-1.3.30" - sources."@swc/core-linux-arm64-musl-1.3.30" - sources."@swc/core-linux-x64-gnu-1.3.30" - sources."@swc/core-linux-x64-musl-1.3.30" - sources."@swc/core-win32-arm64-msvc-1.3.30" - sources."@swc/core-win32-ia32-msvc-1.3.30" - sources."@swc/core-win32-x64-msvc-1.3.30" - sources."@swc/wasm-1.3.30" + sources."@swc/core-1.3.32" + sources."@swc/core-darwin-arm64-1.3.32" + sources."@swc/core-darwin-x64-1.3.32" + sources."@swc/core-linux-arm-gnueabihf-1.3.32" + sources."@swc/core-linux-arm64-gnu-1.3.32" + sources."@swc/core-linux-arm64-musl-1.3.32" + sources."@swc/core-linux-x64-gnu-1.3.32" + sources."@swc/core-linux-x64-musl-1.3.32" + sources."@swc/core-win32-arm64-msvc-1.3.32" + sources."@swc/core-win32-ia32-msvc-1.3.32" + sources."@swc/core-win32-x64-msvc-1.3.32" + sources."@swc/wasm-1.3.32" sources."@ts-morph/common-0.11.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" @@ -145346,32 +144711,31 @@ in sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" sources."@types/node-14.18.33" - sources."@vercel/build-utils-6.0.0" + sources."@vercel/build-utils-6.1.0" sources."@vercel/gatsby-plugin-vercel-analytics-1.0.7" - (sources."@vercel/gatsby-plugin-vercel-builder-1.0.2" // { + (sources."@vercel/gatsby-plugin-vercel-builder-1.1.0" // { dependencies = [ sources."ajv-8.12.0" - sources."esbuild-0.16.17" ]; }) - sources."@vercel/go-2.2.31" - sources."@vercel/hydrogen-0.0.45" - sources."@vercel/next-3.3.19" + sources."@vercel/go-2.3.1" + sources."@vercel/hydrogen-0.0.47" + sources."@vercel/next-3.3.21" sources."@vercel/nft-0.22.5" - sources."@vercel/node-2.8.16" + sources."@vercel/node-2.9.0" sources."@vercel/node-bridge-3.1.10" - sources."@vercel/python-3.1.41" - sources."@vercel/redwood-1.0.52" - sources."@vercel/remix-1.2.8" + sources."@vercel/python-3.1.43" + sources."@vercel/redwood-1.0.54" + sources."@vercel/remix-1.2.10" (sources."@vercel/routing-utils-2.1.8" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/ruby-1.3.57" - sources."@vercel/static-build-1.3.0" - sources."@vercel/static-config-2.0.11" + sources."@vercel/ruby-1.3.59" + sources."@vercel/static-build-1.3.2" + sources."@vercel/static-config-2.0.12" sources."abbrev-1.1.1" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" @@ -145460,7 +144824,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.0.2" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -145729,7 +145093,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -145918,10 +145282,10 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.5.0.tgz"; - sha512 = "r8+ZWDHRAnUPQMyZQa2eZzZyYE8wGia3SCL9ZtVjl6S2MLA5l6NVg3z8Atz4nDQ9JPih858bj0vnthGsjhNLjg=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.6.0.tgz"; + sha512 = "PoDv5KANylqypzkUZTHTuBT8OZfFxhMwNCQ2vXIG1d3ZB6BrE+z6AZ6aJULxz6ZxhIYeCz4GQKFOHqfBlh7XGw=="; }; dependencies = [ sources."@vscode/l10n-0.0.11" @@ -145929,11 +145293,11 @@ in sources."jsonc-parser-3.2.0" sources."picomatch-2.3.1" sources."regenerator-runtime-0.13.11" - sources."request-light-0.5.8" - sources."typescript-4.9.4" + sources."request-light-0.7.0" + sources."typescript-4.9.5" sources."vscode-css-languageservice-6.2.3" sources."vscode-html-languageservice-5.0.4" - sources."vscode-json-languageservice-5.1.4" + sources."vscode-json-languageservice-5.2.0" sources."vscode-jsonrpc-8.1.0-next.7" sources."vscode-languageserver-8.1.0-next.6" (sources."vscode-languageserver-protocol-3.17.3-next.6" // { @@ -145943,7 +145307,11 @@ in }) sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" - sources."vscode-markdown-languageservice-0.2.0" + (sources."vscode-markdown-languageservice-0.3.0-alpha.4" // { + dependencies = [ + sources."@vscode/l10n-0.0.10" + ]; + }) sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" ]; @@ -146264,7 +145632,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -147221,50 +146589,51 @@ in }; dependencies = [ sources."@babel/runtime-7.20.13" - sources."@jimp/bmp-0.16.2" - sources."@jimp/core-0.16.2" - sources."@jimp/custom-0.16.2" - sources."@jimp/gif-0.16.2" - sources."@jimp/jpeg-0.16.2" - sources."@jimp/plugin-blit-0.16.2" - sources."@jimp/plugin-blur-0.16.2" - sources."@jimp/plugin-circle-0.16.2" - sources."@jimp/plugin-color-0.16.2" - sources."@jimp/plugin-contain-0.16.2" - sources."@jimp/plugin-cover-0.16.2" - sources."@jimp/plugin-crop-0.16.2" - sources."@jimp/plugin-displace-0.16.2" - sources."@jimp/plugin-dither-0.16.2" - sources."@jimp/plugin-fisheye-0.16.2" - sources."@jimp/plugin-flip-0.16.2" - sources."@jimp/plugin-gaussian-0.16.2" - sources."@jimp/plugin-invert-0.16.2" - sources."@jimp/plugin-mask-0.16.2" - sources."@jimp/plugin-normalize-0.16.2" - sources."@jimp/plugin-print-0.16.2" - sources."@jimp/plugin-resize-0.16.2" - sources."@jimp/plugin-rotate-0.16.2" - sources."@jimp/plugin-scale-0.16.2" - sources."@jimp/plugin-shadow-0.16.2" - sources."@jimp/plugin-threshold-0.16.2" - sources."@jimp/plugins-0.16.2" - sources."@jimp/png-0.16.2" - sources."@jimp/tiff-0.16.2" - sources."@jimp/types-0.16.2" - sources."@jimp/utils-0.16.2" - sources."@resvg/resvg-js-2.2.0" - sources."@resvg/resvg-js-android-arm-eabi-2.2.0" - sources."@resvg/resvg-js-android-arm64-2.2.0" - sources."@resvg/resvg-js-darwin-arm64-2.2.0" - sources."@resvg/resvg-js-darwin-x64-2.2.0" - sources."@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" - sources."@resvg/resvg-js-linux-arm64-gnu-2.2.0" - sources."@resvg/resvg-js-linux-arm64-musl-2.2.0" - sources."@resvg/resvg-js-linux-x64-gnu-2.2.0" - sources."@resvg/resvg-js-linux-x64-musl-2.2.0" - sources."@resvg/resvg-js-win32-arm64-msvc-2.2.0" - sources."@resvg/resvg-js-win32-ia32-msvc-2.2.0" - sources."@resvg/resvg-js-win32-x64-msvc-2.2.0" + sources."@jimp/bmp-0.16.13" + sources."@jimp/core-0.16.13" + sources."@jimp/custom-0.16.13" + sources."@jimp/gif-0.16.13" + sources."@jimp/jpeg-0.16.13" + sources."@jimp/plugin-blit-0.16.13" + sources."@jimp/plugin-blur-0.16.13" + sources."@jimp/plugin-circle-0.16.13" + sources."@jimp/plugin-color-0.16.13" + sources."@jimp/plugin-contain-0.16.13" + sources."@jimp/plugin-cover-0.16.13" + sources."@jimp/plugin-crop-0.16.13" + sources."@jimp/plugin-displace-0.16.13" + sources."@jimp/plugin-dither-0.16.13" + sources."@jimp/plugin-fisheye-0.16.13" + sources."@jimp/plugin-flip-0.16.13" + sources."@jimp/plugin-gaussian-0.16.13" + sources."@jimp/plugin-invert-0.16.13" + sources."@jimp/plugin-mask-0.16.13" + sources."@jimp/plugin-normalize-0.16.13" + sources."@jimp/plugin-print-0.16.13" + sources."@jimp/plugin-resize-0.16.13" + sources."@jimp/plugin-rotate-0.16.13" + sources."@jimp/plugin-scale-0.16.13" + sources."@jimp/plugin-shadow-0.16.13" + sources."@jimp/plugin-threshold-0.16.13" + sources."@jimp/plugins-0.16.13" + sources."@jimp/png-0.16.13" + sources."@jimp/tiff-0.16.13" + sources."@jimp/types-0.16.13" + sources."@jimp/utils-0.16.13" + sources."@resvg/resvg-js-2.3.1" + sources."@resvg/resvg-js-android-arm-eabi-2.3.1" + sources."@resvg/resvg-js-android-arm64-2.3.1" + sources."@resvg/resvg-js-darwin-arm64-2.3.1" + sources."@resvg/resvg-js-darwin-x64-2.3.1" + sources."@resvg/resvg-js-linux-arm-gnueabihf-2.3.1" + sources."@resvg/resvg-js-linux-arm64-gnu-2.3.1" + sources."@resvg/resvg-js-linux-arm64-musl-2.3.1" + sources."@resvg/resvg-js-linux-x64-gnu-2.3.1" + sources."@resvg/resvg-js-linux-x64-musl-2.3.1" + sources."@resvg/resvg-js-win32-arm64-msvc-2.3.1" + sources."@resvg/resvg-js-win32-ia32-msvc-2.3.1" + sources."@resvg/resvg-js-win32-x64-msvc-2.3.1" + sources."@tokenizer/token-0.3.0" sources."@types/node-16.9.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -147288,7 +146657,7 @@ in sources."escalade-3.1.1" sources."estraverse-5.3.0" sources."exif-parser-0.1.12" - sources."file-type-9.0.0" + sources."file-type-16.5.4" sources."fs-extra-11.1.0" sources."get-caller-file-2.0.5" sources."gifwrap-0.9.4" @@ -147296,9 +146665,10 @@ in sources."graceful-fs-4.2.10" sources."ieee754-1.2.1" sources."image-q-4.0.0" + sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."is-function-1.0.2" - sources."jimp-0.16.2" + sources."jimp-0.16.13" sources."jpeg-js-0.4.4" sources."json5-2.2.3" sources."jsonfile-6.1.0" @@ -147315,21 +146685,29 @@ in sources."parse-bmfont-binary-1.0.6" sources."parse-bmfont-xml-1.1.4" sources."parse-headers-2.0.5" + sources."peek-readable-4.1.0" sources."phin-2.9.3" sources."pixelmatch-4.0.2" sources."pngjs-3.4.0" sources."process-0.11.10" + sources."readable-stream-3.6.0" + sources."readable-web-to-node-stream-3.0.2" sources."regenerator-runtime-0.13.11" sources."require-directory-2.1.1" + sources."safe-buffer-5.2.1" sources."sax-1.2.4" sources."string-width-4.2.3" + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" + sources."strtok3-6.3.0" sources."svg2img-1.0.0-beta.2" sources."timm-1.7.1" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" + sources."token-types-4.2.1" sources."tspan-0.4.0" sources."universalify-2.0.0" sources."utif-2.0.1" + sources."util-deprecate-1.0.2" sources."wavedrom-3.1.1" sources."wrap-ansi-7.0.0" sources."xhr-2.6.0" @@ -147397,7 +146775,7 @@ in sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -147461,7 +146839,7 @@ in sources."bunyan-1.8.15" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.5" // { + (sources."cacheable-request-10.2.6" // { dependencies = [ sources."get-stream-6.0.1" ]; @@ -147503,7 +146881,7 @@ in }) sources."configstore-6.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-js-3.27.1" @@ -148051,11 +147429,11 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -148077,12 +147455,12 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -148107,7 +147485,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."picocolors-1.0.0" sources."punycode-2.3.0" sources."randombytes-2.1.0" @@ -148118,7 +147496,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.3" sources."terser-webpack-plugin-5.3.6" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" @@ -148152,11 +147530,11 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -148181,15 +147559,15 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" sources."commander-9.5.0" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."enhanced-resolve-5.12.0" sources."envinfo-7.8.1" sources."es-module-lexer-0.9.3" @@ -148227,7 +147605,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -148253,7 +147631,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.3" // { dependencies = [ sources."commander-2.20.3" ]; @@ -148299,15 +147677,15 @@ in 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.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" - sources."@types/express-4.17.16" + sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.33" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.0" @@ -148352,12 +147730,12 @@ in sources."bonjour-service-1.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -148371,7 +147749,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -148385,7 +147763,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" @@ -148478,7 +147856,7 @@ in sources."neo-async-2.6.2" sources."node-forge-1.3.1" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-inspect-1.12.3" @@ -148562,7 +147940,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.3" (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" @@ -148629,11 +148007,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -148657,13 +148035,13 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001449" + sources."caniuse-lite-1.0.30001450" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.286" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -148703,7 +148081,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picocolors-1.0.0" @@ -148722,7 +148100,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.3" (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" @@ -148776,7 +148154,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -149201,7 +148579,7 @@ in sources."kleur-3.0.3" sources."lru-cache-6.0.0" sources."minimatch-3.1.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."once-1.4.0" sources."open-8.4.0" sources."path-is-absolute-1.0.1" @@ -149241,10 +148619,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.8.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.1.tgz"; - sha512 = "O4wUr6/FUpk9KVstOUVYbiiZcWc1jKo7q0FfdwEjnMB3oN7Ofs6cIiX++Lzj1ldFSCOw2/aW3UYgixch6B2WCA=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.9.0.tgz"; + sha512 = "5nyyR4bXKG/Rwz0dH+nOx4SWvJWmTZVSbceLyTV+ZOH1sd2vvPnnW14NUzTNEjY3XaT93XH+28mc5+UNSYsFHw=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -149271,7 +148649,7 @@ in sources."@miniflare/watcher-2.11.0" sources."@miniflare/web-sockets-2.11.0" sources."@types/better-sqlite3-7.6.3" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/stack-trace-0.0.29" sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" @@ -149487,7 +148865,7 @@ in sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.32.0" // { + (sources."eslint-8.33.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -149498,7 +148876,7 @@ in sources."eslint-module-utils-2.7.4" sources."eslint-plugin-import-2.27.5" sources."eslint-plugin-jsx-a11y-6.7.1" - (sources."eslint-plugin-react-7.32.1" // { + (sources."eslint-plugin-react-7.32.2" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -149668,10 +149046,10 @@ in "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { name = "_at_yaegassy_slash_coc-nginx"; packageName = "@yaegassy/coc-nginx"; - version = "0.3.6"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.3.6.tgz"; - sha512 = "ml53NkTvLqmhdE4rFY6WK5ZM1l6SFM+sGui1xrurEN1zTN+v0w0ifaNLwoEz/XsQdX3yTpl0oD+MA3JYgx9Tzg=="; + url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.4.0.tgz"; + sha512 = "RY4ygMb9lvhHfc7NJYpYuozYq0Tww1EfRcSP3eVQ15ai57bD5dC7FP/I4Yq3ENYn4tU3rKVM31REY6fLm9micQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -150638,7 +150016,7 @@ in sources."taketalk-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.0.2" sources."mkdirp-1.0.4" ]; }) @@ -150815,7 +150193,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@esm2cjs/cacheable-lookup-7.0.0" - sources."@esm2cjs/cacheable-request-10.2.5" + sources."@esm2cjs/cacheable-request-10.2.6" sources."@esm2cjs/form-data-encoder-2.1.4" sources."@esm2cjs/got-12.5.3" sources."@esm2cjs/http-timer-5.0.1" @@ -150828,23 +150206,23 @@ in sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.34.0" // { + (sources."@sentry/core-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.34.0" // { + (sources."@sentry/integrations-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.34.0" // { + (sources."@sentry/node-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.34.0" - (sources."@sentry/utils-7.34.0" // { + sources."@sentry/types-7.36.0" + (sources."@sentry/utils-7.36.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -150864,14 +150242,14 @@ in sources."@serialport/parser-spacepacket-10.5.0" sources."@serialport/stream-10.5.0" sources."@types/http-cache-semantics-4.0.1" - sources."@zwave-js/cc-10.5.2" - sources."@zwave-js/config-10.5.2" - sources."@zwave-js/core-10.5.0" - sources."@zwave-js/host-10.5.2" - sources."@zwave-js/nvmedit-10.5.0" - sources."@zwave-js/serial-10.5.2" - sources."@zwave-js/shared-10.4.0" - sources."@zwave-js/testing-10.5.2" + sources."@zwave-js/cc-10.6.0" + sources."@zwave-js/config-10.6.0" + sources."@zwave-js/core-10.6.0" + sources."@zwave-js/host-10.6.0" + sources."@zwave-js/nvmedit-10.6.0" + sources."@zwave-js/serial-10.6.0" + sources."@zwave-js/shared-10.6.0" + sources."@zwave-js/testing-10.6.0" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -150988,7 +150366,7 @@ in sources."yallist-4.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" - sources."zwave-js-10.5.4" + sources."zwave-js-10.7.0" ]; buildInputs = globalBuildInputs; meta = { @@ -151014,7 +150392,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" sources."@types/ps-tree-1.1.2" sources."@types/which-2.0.1" sources."braces-3.0.2" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix index ba266ade83..04d31c8815 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ]; # don't run tests in buildPhase diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix index dae42e2b97..c52079f5cc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -10,7 +10,7 @@ buildDunePackage { propagatedBuildInputs = [ alcotest logs lwt fmt ]; doCheck = true; - nativeCheckInputs = [ re cmdliner ]; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix index 52b65817c6..502bd2ad44 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; }; - nativeCheckInputs = [ alcotest ppx_let ]; + checkInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index c74545caf2..fddf128d0d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr ppl camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; + # TODO: Doesn't produce the library correctly if true strictDeps = false; outputs = [ "out" "bin" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix index cdf657ea72..4c98f5b377 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix @@ -36,7 +36,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-clock-unix mirage-profile diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 720294e65e..8447c25cd7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-asn1-combinators"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix index a8d2ef0ace..07ee079cae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix @@ -11,9 +11,8 @@ buildDunePackage { propagatedBuildInputs = [ atdgen-runtime ]; doCheck = true; - nativeCheckInputs = [ alcotest atdgen-codec-runtime - (python3.withPackages (ps: [ ps.jsonschema ])) - ]; + nativeCheckInputs = [ atd (python3.withPackages (ps: [ ps.jsonschema ]))]; + checkInputs = [ alcotest atdgen-codec-runtime ]; meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // { description = "Generates efficient JSON serializers, deserializers and validators"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index 362edaa95b..fd0bf82df3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -18,8 +18,6 @@ buildDunePackage rec { hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo="; }; - nativeBuildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509 cstruct cstruct-sexp sexplib mtime @@ -27,8 +25,10 @@ buildDunePackage rec { ppx_sexp_conv eqaf ]; + buildInputs = [ ppx_cstruct ]; + doCheck = true; - nativeCheckInputs = [ cstruct-unix cmdliner fmt ]; + checkInputs = [ cstruct-unix cmdliner fmt ]; meta = with lib; { description = "SSH implementation in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix index b155c1b669..241df784ad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix @@ -14,7 +14,8 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ cstruct-unix ]; + nativeCheckInputs = [ awa ]; + checkInputs = [ cstruct-unix ]; meta = awa.meta // { mainProgram = "awa_lwt_server"; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index 4585f731e3..0d2b4247bd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ]; - buildInputs = [ linenoise + buildInputs = [ ocamlbuild + linenoise ounit ppx_bitstring z3 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index 9420d3c419..db1a4e8564 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -11,11 +11,11 @@ buildDunePackage rec { sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; }; - propagatedBuildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; # otherwise fmt breaks evaluation doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest bos rresult ]; + checkInputs = [ alcotest bos rresult ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix index 0f5722a44a..6c579e1271 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml_pcre ]; - strictDeps = true; - createFindlibDestdir = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix index 7b23e23fdc..49e5c336d9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { useDune2 = true; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index 7d6bb8806d..2674369f37 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,12 +14,10 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; - strictDeps = !doCheck; - propagatedBuildInputs = [ bigarray-compat ]; nativeBuildInputs = [ findlib pkg-config ]; - nativeCheckInputs = [ alcotest astring fpath bos ]; + checkInputs = [ alcotest astring fpath bos ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix index bd5d470e03..08f50ea53e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -13,11 +13,8 @@ buildDunePackage rec { sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE="; }; - # This currently fails with dune - strictDeps = false; - nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix index 9f4cc91e22..c0d8dd54a3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4="; }; - nativeCheckInputs = [ earley timed ]; + checkInputs = [ earley timed ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix index 22d2b643b2..2c58a40814 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { propagatedBuildInputs = [ camlp-streams easy-format ]; - strictDeps = true; - meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; homepage = "https://github.com/ocaml-community/biniou"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix index 35b36bc944..006316295e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, fetchFromGitHub, fetchpatch , ounit, async, base64, camlzip, cfstream -, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }: +, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm +}: buildDunePackage rec { pname = "biocaml"; @@ -10,8 +11,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "biocaml"; - repo = pname; - rev = "v${version}"; + repo = pname; + rev = "v${version}"; sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s"; }; @@ -21,7 +22,7 @@ buildDunePackage rec { }; buildInputs = [ ppx_jane ppx_sexp_conv ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix index 2b9cbca208..9eb4c74f57 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ bitstring ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = bitstring.meta // { description = "Bitstrings and bitstring matching for OCaml - PPX extension"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix index a986a46f29..25906f1432 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; - strictDeps = true; - createFindlibDestdir = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix index 378af4109c..db0a383f92 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix @@ -1,11 +1,11 @@ -{ - lib, - fetchzip, - buildDunePackage, - bls12-381, - alcotest, - bisect_ppx, - integers_stubs_js, +{ lib +, fetchzip +, buildDunePackage +, bls12-381 +, alcotest +, bisect_ppx +, integers_stubs_js +, }: buildDunePackage rec { @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bls12-381 ]; - nativeCheckInputs = [alcotest bisect_ppx integers_stubs_js]; + checkInputs = [ alcotest bisect_ppx integers_stubs_js ]; doCheck = true; @@ -28,6 +28,6 @@ buildDunePackage rec { description = "Implementation of BLS signatures for the pairing-friendly curve BLS12-381"; license = lib.licenses.mit; homepage = "https://gitlab.com/nomadic-labs/cryptography/ocaml-bls12-381-signature"; - maintainers = [lib.maintainers.ulrikstrid]; + maintainers = [ lib.maintainers.ulrikstrid ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix index b30c1333df..6c1ff541c5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, fetchFromGitLab , ff-sig, zarith, zarith_stubs_js, integers_stubs_js, integers, hex -, alcotest, ff-pbt }: +, alcotest, ff-pbt +}: buildDunePackage rec { pname = "bls12-381"; @@ -23,7 +24,7 @@ buildDunePackage rec { hex ]; - nativeCheckInputs = [ alcotest ff-pbt ]; + checkInputs = [ alcotest ff-pbt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix index 1ae2add216..c72157c677 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix @@ -26,7 +26,7 @@ buildDunePackage rec { zarith ]; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix index 0c5509e08d..aa762502a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ qcheck-core ]; + checkInputs = [ qcheck-core ]; meta = { description = "Backward Lists"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 73f6838501..1dab8e4911 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -39,7 +39,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = with lib; { description = "X.509 trust anchors extracted from Mozilla's NSS"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix index 963989cb22..185944f412 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ cacert # for /etc/ssl/certs/ca-bundle.crt alcotest fmt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix index cf349eeb8b..8fd3f5befe 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { propagatedBuildInputs = [ re ]; - strictDeps = true; - meta = { inherit (src.meta) homepage; description = "A library for handling dates and times"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix index 145bcedacb..2004f8868c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix @@ -25,7 +25,7 @@ buildDunePackage rec { # alcotest isn't available for OCaml < 4.08 due to fmt doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/oklm-wsh/Callipyge"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix index b44fd7db6b..53115c4ecb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr"; }; + strictDeps = true; + nativeBuildInputs = [ omake ocaml @@ -65,6 +67,8 @@ stdenv.mkDerivation rec { meta = with lib; { # 4.2.5 requires OCaml >= 4.06 branch = "4.2.4"; + # incompatible with omake >= 0.10 + broken = true; homepage = "https://gitlab.com/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.lgpl2Only; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix index a83c7c474a..b6768cfe8c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix @@ -17,8 +17,6 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator graphics lablgtk stdio ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix index e5fe670213..ea2a653936 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; - strictDeps = true; - configurePhase = '' runHook preConfigure ocaml configure.ml --share $out/share/camomile diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix index 0f37575d86..18b55b9857 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, buildDunePackage, ocaml , cppo, logs, ptime, uri, bigstringaf -, re, cmdliner, alcotest }: +, re, cmdliner, alcotest +}: buildDunePackage rec { pname = "caqti"; @@ -15,7 +16,7 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ logs ptime uri bigstringaf ]; - nativeCheckInputs = [ re cmdliner alcotest ]; + checkInputs = [ re cmdliner alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 822c002a8d..d6c230d9db 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; inherit (caqti) version src; + duneVersion = "3"; + propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; meta = caqti.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index c3d7204f36..727d407ac5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -56,7 +56,7 @@ buildDunePackage rec { nativeBuildInputs = [ findlib ]; - nativeCheckInputs = [ + checkInputs = [ base64 alcotest alcotest-lwt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix index 60e45823eb..03333deff6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix @@ -24,6 +24,8 @@ buildDunePackage { doCheck = true; nativeCheckInputs = [ git-binary + ]; + checkInputs = [ alcotest alcotest-lwt cstruct diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix index aeedb414a3..b39cb471e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix @@ -17,11 +17,10 @@ buildDunePackage rec { patches = [ ./git_commit.patch ]; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ m4 ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ core_kernel ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix index bad57cb9e9..ebd73b519f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix @@ -32,7 +32,7 @@ buildDunePackage rec { # alcotest isn't available for OCaml < 4.05 due to fmt doCheck = lib.versionAtLeast ocaml.version "4.05"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/abeaumont/ocaml-chacha"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix index faeb905e6a..498dcdfe04 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix @@ -10,10 +10,11 @@ buildDunePackage rec { pname = "checkseum"; minimalOCamlVersion = "4.07"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz"; - sha256 = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; + hash = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; }; buildInputs = [ dune-configurator ]; @@ -24,7 +25,7 @@ buildDunePackage rec { ocaml-freestanding ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bos astring diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix index fb6c14b336..9c427d3437 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "chrome-trace"; inherit (dune_3) src version; + minimalOCamlVersion = "4.08"; duneVersion = "3"; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix index 1290abaa23..f59ad1448a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitLab, buildDunePackage , gmp, pkg-config, dune-configurator , zarith, integers -, alcotest, bisect_ppx }: +, alcotest, bisect_ppx +}: buildDunePackage rec { pname = "class_group_vdf"; @@ -23,12 +24,16 @@ buildDunePackage rec { dune-configurator ]; + buildInputs = [ + dune-configurator + ]; + propagatedBuildInputs = [ zarith integers ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bisect_ppx ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix index bcc1c11459..3e6ac4ae2d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -51,7 +51,7 @@ buildDunePackage { # Examples don't compile with core 0.15. See https://github.com/mirage/ocaml-cohttp/pull/864. doCheck = false; - nativeCheckInputs = [ + checkInputs = [ ounit mirage-crypto core diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index 0cb9813687..fcbed191ad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { propagatedBuildInputs = [ base64 re stringext uri-sexp ]; doCheck = true; - nativeCheckInputs = [ fmt alcotest crowbar ]; + checkInputs = [ fmt alcotest crowbar ]; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 0ff6fb6920..b360cf0e58 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -14,13 +14,18 @@ buildDunePackage { buildInputs = [ cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ - cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime + cohttp-lwt + conduit-lwt + conduit-lwt-unix + fmt + logs + magic-mime ]; # TODO(@sternenseemann): fail for unknown reason # https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742 doCheck = false; - nativeCheckInputs = [ ounit cacert ]; + checkInputs = [ ounit cacert ]; meta = cohttp-lwt.meta // { description = "CoHTTP implementation for Unix and Windows using Lwt"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix index 5996cd7adb..c9b6ad3128 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix @@ -24,8 +24,6 @@ buildDunePackage rec { nativeBuildInputs = [ findlib ]; buildInputs = [ re ]; - strictDeps = true; - doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 3f91d9b753..cb86ea5f4f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -23,7 +23,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ lwt_log ssl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix index 48478c963e..980984c6ec 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix @@ -9,7 +9,7 @@ buildDunePackage { inherit (containers) src version doCheck; buildInputs = [ dune-configurator ]; - nativeCheckInputs = [ gen iter qcheck-core ]; + checkInputs = [ gen iter qcheck-core ]; propagatedBuildInputs = [ containers ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix index 2503ffbf08..4cd6413293 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ either seq ]; - nativeCheckInputs = [ gen iter qcheck-core uutf yojson ]; + checkInputs = [ gen iter qcheck-core uutf yojson ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix index a3894f0cbf..180a09e4d4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix @@ -13,6 +13,8 @@ , uuseg , uutf , yuujinchou +, ounit2 +, qcheck }: let @@ -70,12 +72,13 @@ buildDunePackage { }; nativeBuildInputs = [ - cmdliner menhir - ppxlib ]; - buildInputs = [ containers ]; + buildInputs = [ + cmdliner + ppxlib + ]; propagatedBuildInputs = [ bantorra @@ -87,6 +90,12 @@ buildDunePackage { uuseg uutf yuujinchou + containers + ]; + + checkInputs = [ + ounit2 + qcheck ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix index 1c898f8e75..4688ec4ef3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildDunePackage, ocaml, alcotest -, uri, xmlm, omd, ezjsonm }: +, uri, xmlm, omd, ezjsonm +}: buildDunePackage rec { useDune2 = true; @@ -14,7 +15,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix index 33702ca182..a61a597b20 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { autoheader ''; - buildInputs = [ autoconf ]; + nativeBuildInputs = [ autoconf ]; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix index da55cb1d78..d321abfe9d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { postPatch = "rm -rf examples/xmldiff"; propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; - nativeCheckInputs = [ calendar fpath pprint uutf uunf uucp ]; + checkInputs = [ calendar fpath pprint uutf uunf uucp ]; # uunf is broken on aarch64 doCheck = !stdenv.isAarch64; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 5ef3540a9a..9efe75af70 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ fmt ]; doCheck = true; - nativeCheckInputs = [ alcotest crowbar ]; + checkInputs = [ alcotest crowbar ]; meta = { description = "Access C-like structures directly from OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index c4518de9f9..b640c9745f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -6,14 +6,15 @@ if lib.versionOlder (cstruct.version or "1") "3" then cstruct else -buildDunePackage { - pname = "ppx_cstruct"; - inherit (cstruct) version src meta; + buildDunePackage { + pname = "ppx_cstruct"; + inherit (cstruct) version src meta; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; + propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; - doCheck = true; - nativeCheckInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; -} + doCheck = true; + nativeCheckInputs = [ cppo ]; + checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ]; + } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix index 091a6ab4de..a20911cbb2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -11,7 +11,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ cstruct sexplib ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index 6eb814ef7d..edb31f1836 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -20,10 +20,12 @@ buildDunePackage rec { propagatedBuildInputs = [ integers_stubs_js ]; nativeCheckInputs = [ - ctypes - js_of_ocaml-compiler - ppx_expect nodejs + js_of_ocaml-compiler + ]; + checkInputs = [ + ctypes + ppx_expect ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix index 48a776669d..b4cd7e458a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-cudf"; version = "0.9"; @@ -13,15 +13,16 @@ stdenv.mkDerivation { "all" "opt" ]; + nativeBuildInputs = [ findlib ocaml ocamlbuild pkg-config + perl ]; buildInputs = [ glib - perl stdlib-shims ]; propagatedBuildInputs = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation { "all" "test" ]; - nativeCheckInputs = [ + checkInputs = [ ounit ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix index f82a6c237d..5f0e93f8f2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -16,7 +16,8 @@ buildDunePackage rec { }; propagatedBuildInputs = [ result ]; - nativeCheckInputs = [ alcotest cohttp-lwt-unix cacert ]; + nativeCheckInputs = [ cacert ]; + checkInputs = [ alcotest cohttp-lwt-unix ]; # test dependencies are only available for >= 4.08 # https://github.com/mirage/ca-certs/issues/16 doCheck = lib.versionAtLeast ocaml.version "4.08" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix index e72f4ce0e8..4c38d161ee 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0yy3wf8i7jgvzdc40bni7mvpkvclq97cgb5fw265mrjj0iqpkqpd"; }; + strictDeps = true; + propagatedBuildInputs = [ ncurses ]; nativeBuildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix index b5878a51ef..7bd01ff831 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -36,7 +36,7 @@ buildDunePackage { json-data-encoding-bson ]; - nativeCheckInputs = [ + checkInputs = [ alcotest crowbar ppx_expect diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix index c67cfac541..3e15bd5bbc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; propagatedBuildInputs = [ optint checkseum ]; - nativeCheckInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ]; + checkInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix index dc4f521420..cd14d2a06a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ stdlib-shims ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = with lib; { homepage = "https://github.com/mirage/ocaml-diet"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix index cca890e997..75ecb7fc58 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix @@ -15,12 +15,11 @@ buildDunePackage rec { sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY="; }; - nativeBuildInputs = [ findlib which ]; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ findlib which ocaml pkg-config ]; propagatedBuildInputs = [ eqaf ]; - nativeCheckInputs = [ alcotest astring bos fpath ]; + checkInputs = [ alcotest astring bos fpath ]; doCheck = true; postCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix index e6f6ffc864..587f5a792d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix index dd2a844586..6e23eeecba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix @@ -39,7 +39,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix index 087c0a1efa..e8bd210dcd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix @@ -12,11 +12,28 @@ buildDunePackage { inherit (dns) src version; duneVersion = "3"; - propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr - lwt mirage-random mirage-time mirage-clock - ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage - mtime mirage-crypto-rng ]; - nativeCheckInputs = [ alcotest ]; + propagatedBuildInputs = [ + cstruct + fmt + logs + dns + randomconv + domain-name + ipaddr + lwt + mirage-random + mirage-time + mirage-clock + ca-certs + ca-certs-nss + happy-eyeballs + tcpip + tls + tls-mirage + mtime + mirage-crypto-rng + ]; + checkInputs = [ alcotest ]; doCheck = true; meta = dns.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index e9ae3184b5..81bc741d97 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -1,5 +1,17 @@ -{ lib, buildDunePackage, fetchurl, alcotest -, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt +{ lib +, buildDunePackage +, fetchurl +, alcotest +, cstruct +, domain-name +, duration +, gmap +, ipaddr +, logs +, lru +, metrics +, ptime +, fmt , base64 }: @@ -18,7 +30,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "An Domain Name System (DNS) library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix index 3b2b0e2374..de2a760523 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -1,6 +1,13 @@ -{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec -, domain-name, logs -, alcotest, base64 +{ buildDunePackage +, cstruct +, dns +, mirage-crypto +, mirage-crypto-pk +, mirage-crypto-ec +, domain-name +, logs +, alcotest +, base64 }: buildDunePackage { @@ -20,7 +27,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest base64 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix index fb598746bb..dd46a1534e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix @@ -1,6 +1,18 @@ -{ buildDunePackage, dns, dns-server, dns-mirage, lru, duration -, randomconv, lwt, mirage-time, mirage-clock, mirage-random -, tcpip, tls, tls-mirage, dnssec +{ buildDunePackage +, dns +, dns-server +, dns-mirage +, lru +, duration +, randomconv +, lwt +, mirage-time +, mirage-clock +, mirage-random +, tcpip +, tls +, tls-mirage +, dnssec , alcotest }: @@ -28,7 +40,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix index e10ec38300..049cf507e3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix @@ -1,6 +1,16 @@ -{ buildDunePackage, dns, dns-mirage, randomconv, duration, lwt -, mirage-time, mirage-clock, metrics -, alcotest, mirage-crypto-rng, dns-tsig, base64 +{ buildDunePackage +, dns +, dns-mirage +, randomconv +, duration +, lwt +, mirage-time +, mirage-clock +, metrics +, alcotest +, mirage-crypto-rng +, dns-tsig +, base64 }: buildDunePackage { @@ -21,7 +31,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-crypto-rng dns-tsig diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix index d544e51f36..3ecc90d398 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix @@ -13,7 +13,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix index 7a7a14192f..b27efe5019 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "dolmen"; version = "0.6"; - useDune2 = true; - minimalOCamlVersion = "4.08"; src = fetchurl { @@ -16,8 +14,6 @@ buildDunePackage rec { sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix index f14172fcb5..afbfbb6639 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix index 8da2ed538f..8a36285fe6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchurl, buildDunePackage +{ lib +, fetchurl +, buildDunePackage , lockfree , mirage-clock-unix }: @@ -18,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ lockfree ]; doCheck = true; - nativeCheckInputs = [ mirage-clock-unix ]; + checkInputs = [ mirage-clock-unix ]; meta = { homepage = "https://github.com/ocaml-multicore/domainslib"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix index a593959715..1146da5d30 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix @@ -34,11 +34,13 @@ buildDunePackage rec { ]; nativeCheckInputs = [ - dpkg # Replaces: conf-dpkg - git - ounit python39 # Replaces: conf-python-3 python39Packages.pyyaml # Replaces: conf-python3-yaml + git + ]; + checkInputs = [ + dpkg # Replaces: conf-dpkg + ounit ]; doCheck = false; # Tests are failing. # To enable tests use: lib.versionAtLeast ocaml.version "4.04"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix index 44bc5d7498..ffcfb38c6b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDunePackage }: +{ stdenv, lib, fetchurl, buildDunePackage, ounit }: buildDunePackage rec { pname = "dtoa"; @@ -13,6 +13,10 @@ buildDunePackage rec { sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; + checkInputs = [ ounit ]; + + doCheck = true; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix index 2564d2ed07..583949cf1d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix @@ -1,6 +1,12 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib +, fetchurl +, buildDunePackage +, ocaml , fmt -, alcotest, hxd, crowbar, bigstringaf +, alcotest +, hxd +, crowbar +, bigstringaf }: buildDunePackage rec { @@ -15,7 +21,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ + checkInputs = [ alcotest crowbar hxd diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix index 5d9f105782..9eb7afa2c4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_2 }: +{ lib, buildDunePackage, dune_2, dune-action-plugin }: buildDunePackage rec { pname = "dune-build-info"; @@ -8,6 +8,8 @@ buildDunePackage rec { dontAddPrefix = true; + buildInputs = [ dune-action-plugin ]; + meta = with lib; { inherit (dune_2.meta) homepage; description = "Embed build information inside executables"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix index eeb974b135..1a1f9b0776 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/hannesm/duration"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix index 08c0a284fa..209bf30d2a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix @@ -22,7 +22,9 @@ buildDunePackage rec { hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU="; }; - buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir menhirLib path_glob ppx_deriving_yojson ]; + nativeBuildInputs = [ menhir ]; + + buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ]; passthru.updateScript = gitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index cc53f25b57..1c60c963ed 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -36,9 +36,12 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; - buildInputs = [ perl ncurses ] + # atdgen is both a library and executable + nativeBuildInputs = [ perl camlp5 ] ++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; + buildInputs = [ ncurses ] + ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; propagatedBuildInputs = [ re stdlib-shims ] ++ (if lib.versionAtLeast version "1.15" || version == "dev" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix index c76d79d5f8..f1c61ce27e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix @@ -1,6 +1,14 @@ -{ lib, buildDunePackage, fetchurl, ocaml -, angstrom, ipaddr, base64, pecu, uutf -, alcotest, cmdliner +{ lib +, buildDunePackage +, fetchurl +, ocaml +, angstrom +, ipaddr +, base64 +, pecu +, uutf +, alcotest +, cmdliner }: buildDunePackage rec { @@ -28,7 +36,7 @@ buildDunePackage rec { # and angstrom (fmt) are only available for >= 4.08. Disabling # tests for < 4.08 at least improves the error message doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = with lib; { description = "Parser of email address according RFC822"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix index 317446fc5b..7c15edabd5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix @@ -1,5 +1,12 @@ -{ lib, buildDunePackage, fetchurl, ocaml -, fmt, bigstringaf, angstrom, alcotest }: +{ lib +, buildDunePackage +, fetchurl +, ocaml +, fmt +, bigstringaf +, angstrom +, alcotest +}: buildDunePackage rec { pname = "encore"; @@ -15,7 +22,7 @@ buildDunePackage rec { useDune2 = true; propagatedBuildInputs = [ angstrom fmt bigstringaf ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix index 59c581e128..6d76590c6c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9"; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix index ff5ed12a99..0dcfd5ec02 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI="; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix index 4d9c69ace6..5681b33cb7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { zarith ]; - nativeCheckInputs = [ + checkInputs = [ alcotest ff-pbt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix index 6c929e11b1..ffd7838112 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix @@ -6,7 +6,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix index e2f5fdab4f..0431c733cb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { stdlib-shims ]; - nativeCheckInputs = [ + checkInputs = [ ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 2fae764f5d..837a481cf1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; meta = { description = "OCaml client for google services"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix index 9242133ec2..ee932bffd5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; - nativeCheckInputs = [ qcheck ounit2 ]; + checkInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix index ec8bbb3161..c3bf3a2ec9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index b078ad973f..957d53b396 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -32,7 +32,10 @@ buildDunePackage rec { domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; nativeCheckInputs = [ - alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner + git-binary + ]; + checkInputs = [ + alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner ]; doCheck = !stdenv.isAarch64; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix index b1e38c2ebf..28ce7c4a3f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix @@ -1,4 +1,5 @@ -{ lib, buildDunePackage +{ lib +, buildDunePackage , git , mimic , mimic-happy-eyeballs @@ -82,7 +83,7 @@ buildDunePackage { result ]; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt bigstringaf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index 65a4619ac5..f5e8337382 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -18,8 +18,11 @@ buildDunePackage { duneVersion = "3"; buildInputs = [ - awa awa-mirage cmdliner - mirage-clock tcpip + awa + awa-mirage + cmdliner + mirage-clock + tcpip ]; propagatedBuildInputs = [ rresult result bigstringaf @@ -30,12 +33,13 @@ buildDunePackage { tls tls-mirage git happy-eyeballs-lwt git-mirage mirage-clock-unix ]; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt base64 ke - mirage-crypto-rng git-binary + mirage-crypto-rng uri mtime cacert # sets up NIX_SSL_CERT_FILE ]; + nativeCheckInputs = [ git-binary ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix index 7cdddfe101..ce13b0e1ce 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ocaml, fetchurl, alcotest }: +{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt }: buildDunePackage rec { pname = "gmap"; @@ -13,7 +13,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest fmt ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix index b4f836215d..b202d46abd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -1,6 +1,14 @@ -{ lib, buildDunePackage, ocaml-crunch -, astring, cohttp, digestif, graphql, ocplib-endian -, alcotest, cohttp-lwt-unix, graphql-lwt +{ lib +, buildDunePackage +, ocaml-crunch +, astring +, cohttp +, digestif +, graphql +, ocplib-endian +, alcotest +, cohttp-lwt-unix +, graphql-lwt }: buildDunePackage rec { @@ -13,7 +21,7 @@ buildDunePackage rec { nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; - nativeCheckInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ]; + checkInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix index b0426500b3..679d89f44b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ graphql_parser rresult yojson ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix index 396de94bc2..cbdcba64ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ graphql ocaml_lwt ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix index 25432d9ad8..4042e65772 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ fmt re ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 1c3351f791..9314c1033d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -18,7 +18,9 @@ buildDunePackage rec { sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44="; }; - buildInputs = [ ppxlib ]; + nativeBuildInputs = [ reason ]; + + buildInputs = [ ppxlib reason ]; propagatedBuildInputs = [ reason @@ -26,7 +28,7 @@ buildDunePackage rec { yojson ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix index 6f60330e40..95272890e1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix @@ -46,7 +46,7 @@ buildDunePackage rec { preCheck = '' ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case ''; - nativeCheckInputs = [ + checkInputs = [ alcotest yojson hex diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index d5b0691fdf..a3a2a3cff1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ="; }; - strictDeps = true; - propagatedBuildInputs = [ domain-name duration diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index 9160b9233f..50f1f94557 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -19,8 +19,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; duneVersion = "3"; - strictDeps = true; - buildInputs = [ cmdliner duration diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index 22f17111e4..eb15706efa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -21,8 +21,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; duneVersion = "3"; - strictDeps = true; - buildInputs = [ duration ipaddr diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix index b4492f438c..68fc506222 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; }; - strictDeps = true; - minimumOCamlVersion = "4.03"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix index 5921c6c9d3..3df9ad5307 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ cstruct mirage-crypto ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix index 691e09a410..508b2e4b7f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z"; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ angstrom faraday ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix index 27ad2b5f00..10509f1e75 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,5 +1,10 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, decompress, stdlib-shims, alcotest +{ lib +, fetchurl +, buildDunePackage +, ocaml +, decompress +, stdlib-shims +, alcotest }: buildDunePackage rec { @@ -17,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ decompress stdlib-shims ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "Image formats such as PNG and PPM in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index f38d1f495f..04373cbcce 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { lru ]; - nativeCheckInputs = [ + checkInputs = [ alcotest crowbar re diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index 026985efcb..2dce9320af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix @@ -15,10 +15,8 @@ buildDunePackage rec { }; buildInputs = [ lwt ]; - nativeCheckInputs = [ ounit2 fileutils ]; - # Otherwise nativeCheckInputs can't be found - strictDeps = false; + checkInputs = [ ounit2 fileutils ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix index 915bea6ff0..b576282224 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: +{ lib, fetchurl, buildDunePackage, pkg-config, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; @@ -11,8 +11,9 @@ buildDunePackage rec { sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cstruct bigarray-compat ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix index 5055aa7bbb..c4eefb637f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -10,7 +10,7 @@ buildDunePackage rec { propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; - nativeCheckInputs = [ ppx_sexp_conv ounit ]; + checkInputs = [ ppx_sexp_conv ounit ]; doCheck = true; meta = macaddr.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 6f94382cf3..373b5a87e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ipaddr ]; - nativeCheckInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; + checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; doCheck = true; meta = ipaddr.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix index 39ef6b0006..61a0d6021a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -4,11 +4,12 @@ buildDunePackage rec { pname = "irmin-chunk"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt logs lwt ]; doCheck = true; - nativeCheckInputs = [ alcotest irmin-test ]; + checkInputs = [ alcotest irmin-test ]; meta = irmin.meta // { description = "Irmin backend which allow to store values into chunks"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix index fe7eb3ffc5..aa003f39b3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix @@ -7,18 +7,25 @@ buildDunePackage { pname = "irmin-containers"; inherit (ppx_irmin) src version strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin ]; propagatedBuildInputs = [ - irmin irmin-fs ppx_irmin lwt mtime + irmin + irmin-fs + ppx_irmin + lwt + mtime ]; doCheck = true; - nativeCheckInputs = [ - alcotest alcotest-lwt cacert + checkInputs = [ + alcotest + alcotest-lwt + cacert ]; meta = ppx_irmin.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index 13ae4109de..485547ddca 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -9,7 +9,8 @@ buildDunePackage { inherit (ppx_irmin) src version strictDeps; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ astring @@ -28,7 +29,7 @@ buildDunePackage { uutf ]; - nativeCheckInputs = [ + checkInputs = [ vector hex alcotest diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix index 196f75ff26..4b8d7c4b97 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix @@ -1,15 +1,17 @@ { lib, buildDunePackage, irmin, astring, logs, lwt -, alcotest, irmin-test, irmin-watcher }: +, alcotest, irmin-test, irmin-watcher +}: buildDunePackage rec { pname = "irmin-fs"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin astring logs lwt ]; - nativeCheckInputs = [ alcotest irmin-test irmin-watcher ]; + checkInputs = [ alcotest irmin-test irmin-watcher ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index b325937286..c489281591 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -30,7 +30,7 @@ buildDunePackage { cohttp-lwt-unix ]; - nativeCheckInputs = [ mtime alcotest irmin-test cacert ]; + checkInputs = [ mtime alcotest irmin-test cacert ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index 21fe590c05..005bf25eb2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -13,7 +13,7 @@ buildDunePackage rec { doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt logs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index 5cf57fe047..9a466928c6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ]; - nativeCheckInputs = [ + checkInputs = [ digestif git-unix irmin-git irmin-test irmin-fs cacert ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix index 9e4bd93307..2d7d0a8912 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "irmin-mirage"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt ptime mirage-clock diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix index 7056a2f63e..8c0c7b2a3b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,10 +1,11 @@ { lib, buildDunePackage -, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner +, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner, checkseum, rusage , alcotest, alcotest-lwt, astring, irmin-test }: buildDunePackage rec { - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; + duneVersion = "3"; pname = "irmin-pack"; @@ -12,9 +13,9 @@ buildDunePackage rec { nativeBuildInputs = [ ppx_irmin ]; - propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner ]; + propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner checkseum rusage ]; - nativeCheckInputs = [ astring alcotest alcotest-lwt irmin-test ]; + checkInputs = [ astring alcotest alcotest-lwt irmin-test ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index 2e21331c22..4ff7f4a8bd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,16 +2,15 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "sha256-kig2EWww7GgGijhpSgm7pSHPR+3Q5K5E4Ha5tJY9oYA="; + hash = "sha256-zXiKjT9KPdGNwWChU9SuyR6vaw+0GtQUZNJsecMEqY4="; }; minimalOCamlVersion = "4.10"; - - strictDeps = false; # We must provide nativeCheckInputs as buildInputs because dune builds tests at build time + duneVersion = "3"; propagatedBuildInputs = [ ppx_repr diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix index ee13bf4267..4e2ccce716 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix @@ -8,6 +8,7 @@ buildDunePackage { pname = "irmin-test"; inherit (irmin) version src strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin ]; @@ -27,7 +28,7 @@ buildDunePackage { metrics ]; - nativeCheckInputs = [ hex vector ]; + checkInputs = [ hex vector ]; meta = irmin.meta // { description = "Irmin test suite"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix index 2549a783bd..ddfc0d0732 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -7,22 +7,23 @@ buildDunePackage rec { pname = "irmin-tezos"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ - irmin - irmin-pack - ppx_irmin - digestif - fmt - tezos-base58 + irmin + irmin-pack + ppx_irmin + digestif + fmt + tezos-base58 ]; buildInputs = [ - cmdliner - yojson + cmdliner + yojson ]; - nativeCheckInputs = [ alcotest hex irmin-test fpath ]; + checkInputs = [ alcotest hex irmin-test fpath ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix index 62ea8f78b4..26adaf06d1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix @@ -18,7 +18,8 @@ buildDunePackage rec { propagatedBuildInputs = [ result seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ mdx.bin ounit2 qcheck-core ]; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ ounit2 qcheck-core ]; meta = { homepage = "https://github.com/c-cube/sequence"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index d32c2027df..075f7c1f57 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -155,7 +155,7 @@ with self; meta.description = "Full standard library replacement for OCaml"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ sexplib0 ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; }; base_bigstring = janePackage { @@ -205,9 +205,7 @@ with self; minimumOCamlVersion = "4.07"; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; - nativeCheckInputs = [ ppx_jane ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ppx_jane ]; }; core = janePackage { @@ -782,9 +780,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - nativeCheckInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ounit ]; }; shexp = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index af040a7394..7433c116b6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -177,7 +177,7 @@ with self; meta.description = "Full standard library replacement for OCaml"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ sexplib0 ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; }; base_bigstring = janePackage { @@ -958,9 +958,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - nativeCheckInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ounit ]; }; shexp = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix index da26875760..9552268abc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -16,8 +16,6 @@ buildDunePackage (args // { sha256 = hash; }; - strictDeps = true; - meta = { license = lib.licenses.asl20; homepage = "https://github.com/janestreet/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 5b91868357..d61f1b6d41 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -16,8 +16,6 @@ buildDunePackage (args // { sha256 = hash; }; - strictDeps = true; - meta = { license = lib.licenses.mit; homepage = "https://github.com/janestreet/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index d124baea89..e3c3efc999 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -6,12 +6,11 @@ , minimumOCamlVersion ? "4.08" , doCheck ? true , buildInputs ? [] -, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version buildInputs strictDeps; + inherit version buildInputs; inherit minimumOCamlVersion; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix index 6785990899..7306ce46bf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix @@ -6,12 +6,11 @@ , minimumOCamlVersion ? "4.11" , doCheck ? true , buildInputs ? [] -, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version buildInputs strictDeps; + inherit version buildInputs; inherit minimumOCamlVersion; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix index 3029f4084c..5ee48d3ed2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,5 +1,6 @@ { lib, buildDunePackage, fetchFromGitHub -, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }: +, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 +}: buildDunePackage rec { pname = "jingoo"; @@ -16,9 +17,9 @@ buildDunePackage rec { sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA="; }; - buildInputs = [ menhir ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ]; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index a92c4839ab..46810ab156 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -10,7 +10,7 @@ buildDunePackage { ocplib-endian ]; - nativeCheckInputs = [ + checkInputs = [ crowbar alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix index ff3667bd79..13b81d9c52 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { uri ]; - nativeCheckInputs = [ + checkInputs = [ crowbar alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix index f8ba36d969..745f86dff5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ digestif fmt yojson base64 re ppx_deriving ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix index 519b0c1725..2438249479 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; - nativeCheckInputs = [ alcotest bigstringaf ]; + checkInputs = [ alcotest bigstringaf ]; doCheck = true; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix index b010272b54..55dd88d724 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ freeglut ]; propagatedBuildInputs = [ libGLU libGL ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index bcf82e1c38..3d5135d743 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 75b3940a1d..66728db655 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 4d5c4ae303..465c82da12 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { inherit (param) version src; pname = "ocaml${ocaml.version}-labltk"; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib makeWrapper ]; buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix index c073ddf39c..a2294822a0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -16,8 +16,6 @@ buildDunePackage rec { duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "2"; - strictDeps = true; - src = fetchFromGitHub { owner = "ocaml-community"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix index f0509c243e..1478687fe5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -33,8 +33,8 @@ buildDunePackage rec { bindlib camlp-streams cmdliner pratter sedlex stdlib-shims timed why3 yojson ]; - nativeCheckInputs = [ alcotest dedukti ]; - doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory") + checkInputs = [ alcotest dedukti ]; + doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory") meta = with lib; { homepage = "https://github.com/Deducteam/lambdapi"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix index ee3876d5da..d7d0028b2c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ markup ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lem/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lem/default.nix new file mode 100644 index 0000000000..39952366db --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lem/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, lib +, ncurses +, makeWrapper +, ocamlbuild +, findlib +, ocaml +, num +, zarith +}: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "lem is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-lem"; + version = "2022-12-10"; + + src = fetchFromGitHub { + owner = "rems-project"; + repo = "lem"; + rev = version; + hash = "sha256-ZQgcuIVRkJS0KtpzjbO4OPHGg6B0TadWA6XpRir30y8="; + }; + + nativeBuildInputs = [ makeWrapper ocamlbuild findlib ocaml ]; + propagatedBuildInputs = [ zarith num ]; + + installFlags = [ "INSTALL_DIR=$(out)" ]; + + createFindlibDestdir = true; + + postInstall = '' + wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library + ''; + + meta = with lib; { + homepage = "https://github.com/rems-project/lem"; + description = "A tool for lightweight executable mathematics"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = with licenses; [ bsd3 gpl2 ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix index efebb5309e..c9cd5572bc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { buildInputs = [ ppx_deriving ppxlib ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = with lib; { homepage = "https://github.com/pdonadeo/ocaml-lens"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix index 6f14af03e5..13875147a4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -52,7 +52,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "ACME implementation in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/linksem/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/linksem/default.nix new file mode 100644 index 0000000000..751f4e14a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/linksem/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, stdenv +, findlib +, ocaml +, lem +}: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "linksem is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-linksem"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "rems-project"; + repo = "linksem"; + rev = version; + hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA="; + }; + + nativeBuildInputs = [ findlib ocaml ]; + + propagatedBuildInputs = [ lem ]; + + createFindlibDestdir = true; + + meta = with lib; { + homepage = "https://github.com/rems-project/linksem"; + description = "A formalisation of substantial parts of ELF linking and DWARF debug information"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + platforms = ocaml.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix index 6a8e871bda..c3400d4583 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ dscheck ]; doCheck = true; - nativeCheckInputs = [ qcheck qcheck-alcotest ]; + checkInputs = [ qcheck qcheck-alcotest ]; meta = { description = "Lock-free data structures for multicore OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix index dfa765d564..678023bb8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { propagatedBuildInputs = [ psq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ qcheck-alcotest ]; + checkInputs = [ qcheck-alcotest ]; meta = { homepage = "https://github.com/pqwy/lru"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix index 17d2187934..97084b913e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lustre-v6"; - version = "6.107.1"; + version = "6.107.3"; minimalOCamlVersion = "4.12"; src = fetchurl { - url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; - hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I="; + url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; + hash = "sha256-z3cljDyxtotCGUIdYEzYu7fQd04RC3hhWpROcMh6Zng="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix index e2df6f321f..da7f9ba180 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { nativeBuildInputs = [ file ]; propagatedBuildInputs = [ ctypes result ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix index 12675eda9a..b28981b1b7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "e86ce75e40f00d51514cf8b2e71e5184c4cb5dae96136be24613406cfc0dba6e"; }; - nativeCheckInputs = [ + checkInputs = [ lwt ]; doCheck = lib.versionAtLeast ocaml.version "4.03"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix index 9be06c2e61..8004cfcd4b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE="; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ libev ocplib-endian ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 18bc15673b..7eb74ff064 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn"; }; - nativeCheckInputs = [ ppx_sexp_conv ounit ]; + checkInputs = [ ppx_sexp_conv ounit ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix index 15d5602e7e..1f03c1326a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -9,7 +9,7 @@ buildDunePackage { propagatedBuildInputs = [ ppx_sexp_conv ]; - nativeCheckInputs = [ macaddr-cstruct ounit ]; + checkInputs = [ macaddr-cstruct ounit ]; doCheck = true; meta = macaddr.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix index 1782326335..535557c0e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ uchar uutf ]; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index 4affea9951..02ef060444 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml, findlib , alcotest , astring, cppo, fmt, logs, ocaml-version, odoc-parser, lwt, re, csexp , gitUpdater @@ -17,8 +17,8 @@ buildDunePackage rec { }; nativeBuildInputs = [ cppo ]; - propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re ]; - nativeCheckInputs = [ alcotest lwt ]; + propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re findlib ]; + checkInputs = [ alcotest lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix index 312169acb6..ddb610f557 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix @@ -1,6 +1,7 @@ { lib, fetchzip, buildDunePackage, ocaml , zarith, eqaf, bigarray-compat, hex, ff-sig, ff -, alcotest, bisect_ppx }: +, alcotest, bisect_ppx +}: buildDunePackage rec { pname = "mec"; @@ -27,7 +28,7 @@ buildDunePackage rec { zarith ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bisect_ppx ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix index b295c0eda0..a8ccd2cf4a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix index 837bf6c2dc..5fcf7cf511 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix index ef32ed3159..5df5e14982 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix @@ -13,7 +13,8 @@ buildDunePackage rec { propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ]; - nativeCheckInputs = [ metrics-lwt ]; + nativeCheckInputs = [ gnuplot ]; + checkInputs = [ metrics-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix index 1522b2def3..097ecb3135 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt bigstringaf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 940e9a7791..0d0851536b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildDunePackage, cstruct-lwt, diet, logs -, mirage-block, ounit2, rresult, uri }: +, mirage-block, ounit2, rresult, uri +}: buildDunePackage rec { pname = "mirage-block-unix"; @@ -16,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; doCheck = true; - nativeCheckInputs = [ diet ounit2 ]; + checkInputs = [ diet ounit2 ]; meta = with lib; { description = "MirageOS disk block driver for Unix"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix index 7461ef91da..bdafeb4305 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; doCheck = true; - nativeCheckInputs = [ alcotest mirage-flow-combinators ]; + checkInputs = [ alcotest mirage-flow-combinators ]; meta = { description = "Buffered channels for MirageOS FLOW types"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 5bbf5d0fcb..d5f110948d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; @@ -25,8 +25,6 @@ buildDunePackage rec { ocaml-freestanding ]; - strictDeps = !doCheck; - meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 5a9de788a5..3afe582413 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -26,7 +26,6 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - ocaml dune-configurator ]; propagatedBuildInputs = [ @@ -37,10 +36,10 @@ buildDunePackage rec { ocaml-freestanding ]; - strictDeps = !doCheck; + strictDeps = true; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ hex alcotest asn1-combinators diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index d10e51ea0e..b79f49c64b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -10,10 +10,8 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; - strictDeps = !doCheck; - doCheck = true; - nativeCheckInputs = [ ounit2 randomconv ]; + checkInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index f9a244de36..c3703a5a60 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -9,13 +9,11 @@ buildDunePackage rec { inherit (mirage-crypto-rng) version src; doCheck = true; - nativeCheckInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; + checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; - strictDeps = !doCheck; - meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index eb7e0cf0e4..044b8ed27b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -7,12 +7,12 @@ buildDunePackage rec { inherit (mirage-crypto) version src; doCheck = true; - nativeCheckInputs = [ ounit2 randomconv ]; + checkInputs = [ ounit2 randomconv ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; - strictDeps = !doCheck; + strictDeps = true; meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 6a317ca34c..023896447d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -1,5 +1,6 @@ { buildDunePackage, fmt, logs, mirage-flow, ocaml_lwt, cstruct -, alcotest, mirage-flow-combinators }: +, alcotest, mirage-flow-combinators +}: buildDunePackage { pname = "mirage-flow-unix"; @@ -14,7 +15,7 @@ buildDunePackage { propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; doCheck = true; - nativeCheckInputs = [ alcotest mirage-flow-combinators ]; + checkInputs = [ alcotest mirage-flow-combinators ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS on Unix"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix index 771efcef2b..20d83e1664 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt mirage-device ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "MirageOS signatures for key/value devices"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix index 133d49ddf9..7aabd51b81 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix index 0fdc6d4fa9..fea1e712ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-clock-unix ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix index 76f11cfd90..410475b6b5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { # Tests need opam-monorepo doCheck = false; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index 25062bcb0d..8182b7b5ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -10,7 +10,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix index 54f137aecd..a2d1187656 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix @@ -62,7 +62,7 @@ buildDunePackage rec { mirage-crypto-rng ]; - nativeCheckInputs = [ + checkInputs = [ alcotest jsonm ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix index 8c9149c4af..4d44f3b977 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix @@ -13,13 +13,13 @@ buildDunePackage rec { hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII="; }; - nativeBuildInputs = [ lwt_ppx ]; + buildInputs = [ lwt_ppx ]; propagatedBuildInputs = [ lwt stringext ]; duneVersion = "3"; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "Parser for multipart/form-data (RFC2388)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix index 6fcf7757f2..5d4b39b21a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix @@ -11,11 +11,12 @@ buildDunePackage rec { sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py"; }; - buildInputs = [ ezjsonm menhir ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ ezjsonm ]; propagatedBuildInputs = [ menhirLib ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "Mustache logic-less templates in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/netchannel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/netchannel/default.nix index 61e5c70edd..ce859d366b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/netchannel/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/netchannel/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs="; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f0e70699ad..2c2ffecf3d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config unzip ocaml automake gnum4 autoconf findlib ]; buildInputs = [ freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 942d69e591..3588495884 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { ./configurable-binding.patch ]; + strictDeps = true; + nativeBuildInputs = [ ocaml pkg-config diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index f99a84cf61..e6a7781946 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -7,9 +7,9 @@ buildDunePackage { propagatedBuildInputs = [ camomile ocaml_gettext ]; doCheck = true; - nativeCheckInputs = [ ounit fileutils ]; + checkInputs = [ ounit fileutils ]; - meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { + meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { description = "Internationalization library using camomile (i18n)"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index bd887b4b9f..c65f506469 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -11,14 +11,14 @@ buildDunePackage rec { sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ gettext fileutils ]; # Tests for version 0.4.2 are not compatible with OUnit 2.2.6 doCheck = false; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index d8999dcbae..75e739959c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -12,7 +12,7 @@ buildDunePackage rec { doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-vdom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-vdom/default.nix index 6ae36252aa..72c1cb148c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-vdom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-vdom/default.nix @@ -11,6 +11,10 @@ buildDunePackage rec { sha256 = "sha256-FVR0WubW9VJBGVtVaXdJ+O/ghq0w5+BuItFWXkuVYL8="; }; + nativeBuildInputs = [ + gen_js_api + ]; + buildInputs = [ gen_js_api ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix index aeb9c9dc69..28f12046ea 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, alcotest }: buildDunePackage rec { pname = "ocaml-version"; @@ -9,6 +9,10 @@ buildDunePackage rec { sha256 = "sha256-2MG+tejY67dxC19DTOZqPsi3UrHk1rqHxP4nRSvbiiU="; }; + checkInputs = [ alcotest ]; + + doCheck = true; + minimumOCamlVersion = "4.07"; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 13ac62f645..1efcbf382d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -11,9 +11,6 @@ buildDunePackage rec { sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; - # This currently fails with dune - strictDeps = false; - nativeBuildInputs = [ camlidl ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ camlidl fuse ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix index 0be4e78066..850c29c4dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ocaml findlib ]; - buildInputs = [ ounit]; + checkInputs = [ ounit ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 3482aa37e7..2a33d8b17c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config ocaml findlib ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 3ee300a5a9..f4225c917d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl +{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs , cohttp, cohttp-lwt-unix, hmap , lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr @@ -31,7 +31,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ makeWrapper which ]; - buildInputs = [ lwt_react camlzip ]; + buildInputs = [ lwt_react camlzip findlib ]; propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl ocaml_pcre xml-light diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix index 24d2c04c6c..a16fbc578d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; # Ensure compatibility of v0.6 with menhir ≥ 20220210 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix index 34f3e84304..924f643cc8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix @@ -16,9 +16,11 @@ buildDunePackage rec { # dune 3 is required for tests to pass duneVersion = if doCheck then "3" else "2"; - buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ]; + nativeBuildInputs = [ cppo ]; + buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ]; - nativeCheckInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; + nativeCheckInputs = [ bash jq ]; + checkInputs = [ markup yojson sexplib0 jq ppx_expect ]; doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder yojson.version "2.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix index 26632f37d2..b98d892696 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix @@ -49,7 +49,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest-lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ordering/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ordering/default.nix index c3bffc013f..8613ccf9ae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ordering/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ordering/default.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "ordering"; inherit (dune_3) version src; duneVersion = "3"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix index f680c3794c..cbe02de2ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { duneVersion = "3"; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ containers qcheck ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix index 3f06a098d0..4a2e605f4c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix @@ -19,8 +19,6 @@ buildDunePackage rec { sha256 = "sha256-Xd3fHBN1f+tvgRFCxD/Gz8/lIvezknz7Zy3EtdqoTEM="; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib uutf ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix index 7872edca59..3b75428d0e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,22 +1,22 @@ { lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: buildDunePackage rec { - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; pname = "ounit2"; version = "2.2.6"; - useDune2 = lib.versionAtLeast ocaml.version "4.08"; + duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "2" else "1"; src = fetchurl { url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz"; - sha256 = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM="; + hash = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM="; }; propagatedBuildInputs = [ seq stdlib-shims ]; doCheck = true; - nativeCheckInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; + checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; meta = with lib; { homepage = "https://github.com/gildor478/ounit"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix index b5f707446a..6e77b6312f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix @@ -16,11 +16,14 @@ buildDunePackage rec { inherit (owl-base) version src meta useDune2; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; buildInputs = [ dune-configurator stdio ]; propagatedBuildInputs = [ - eigen openblasCompat owl-base npy + eigen + openblasCompat + owl-base + npy ]; - doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 + doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix index 97396769fd..2f28914930 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,7 +22,7 @@ buildDunePackage { inherit (paf) version src - ; + ; duneVersion = "3"; @@ -35,7 +35,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest-lwt fmt logs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index d172e73e13..e75efeb2ad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -50,7 +50,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ lwt logs fmt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix index 79a6a541a5..4bc409245e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "Process strings into sets of command-line arguments"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix index 5dedd200a8..d6b9bdb7e7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ cstruct mirage-crypto ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix index aa65deff74..ffd1837877 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { sha256 = "14c5rpgglyz41jic0fg0xa22d2w1syb86kva22y9fi7aqj9vm31f"; }; - nativeBuildInputs = [ + buildInputs = [ ppx_tools ppx_cstruct ]; @@ -28,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit mmap ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix index cc2827ad53..22c1913635 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { # crowbar availability doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ fmt alcotest crowbar astring ]; + checkInputs = [ fmt alcotest crowbar astring ]; meta = with lib; { description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index c8fbeb103a..e67429a6a4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -27,8 +27,9 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - nativeCheckInputs = [ alcotest bppsuite ]; - buildInputs = [ menhir ]; + nativeCheckInputs = [ bppsuite ]; + checkInputs = [ alcotest ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ angstrom-unix biocaml diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 653f86c03a..39ae5a86c5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ piqi stdlib-shims ]; - nativeCheckInputs = [ num ]; + checkInputs = [ num ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix index a63876ec5b..d87f6b39ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix @@ -15,7 +15,8 @@ buildDunePackage rec { sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn"; }; - buildInputs = [ dune-configurator postgresql ]; + nativeBuildInputs = [ postgresql ]; + buildInputs = [ dune-configurator ]; meta = { description = "Bindings to the PostgreSQL library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix index c53b594655..7602d70245 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { useDune2 = true; minimalOCamlVersion = "4.08"; - nativeCheckInputs = [ ppx_expect ]; + checkInputs = [ ppx_expect ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix index 9bf509801b..6248e4e6a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index c58004b9ad..88f187cc70 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -42,8 +42,6 @@ buildDunePackage rec { ctypes ]; - strictDeps = true; - meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix index dba8ffc743..e1c31c3ec2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -39,8 +39,7 @@ buildDunePackage rec { inherit (params) sha256; }; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ cppo ]; buildInputs = [ ppxlib ]; @@ -53,7 +52,7 @@ buildDunePackage rec { ]; doCheck = lib.versionOlder ocaml.version "5.0"; - nativeCheckInputs = [ + checkInputs = [ (if lib.versionAtLeast version "5.2" then ounit2 else ounit) ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index 1b48c90e1d..5bf70a0565 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index ff7fc30e98..acc36f2b01 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -3,13 +3,14 @@ buildDunePackage rec { pname = "ppx_deriving_rpc"; - inherit (rpclib) version useDune2 src; + inherit (rpclib) version src; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; - nativeCheckInputs = [ alcotest yojson ]; + checkInputs = [ alcotest yojson ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 98872feb14..c6a0f6d0af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "A YAML codec generator for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 87784177ed..4fef3c0619 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib ppx_deriving yojson ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "A Yojson codec generator for OCaml >= 4.04"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix index dca50972e3..120ce1893b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -25,8 +25,6 @@ buildDunePackage rec { pname = "ppx_import"; inherit version; - useDune2 = true; - minimalOCamlVersion = "4.05"; src = fetchurl { @@ -38,7 +36,7 @@ buildDunePackage rec { ppxlib ]; - nativeCheckInputs = [ + checkInputs = [ ounit ppx_deriving ppx_sexp_conv diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix index d3af0ea154..2d5f73be42 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -58,8 +58,6 @@ then inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; duneVersion = "3"; - - strictDeps = true; } else stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix index 339eac87be..a44e815092 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ camlp-streams ]; - nativeCheckInputs = [ alcotest qcheck qcheck-alcotest ]; + checkInputs = [ alcotest qcheck qcheck-alcotest ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix index 7cdbc7b05b..d19233cf13 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { ke ]; - nativeCheckInputs = [ + checkInputs = [ ptime alcotest jsonm diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix index 35c7ee9eb4..4c00ff9846 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt logs mtime optint terminal vector ]; doCheck = true; - nativeCheckInputs = [ alcotest astring ]; + checkInputs = [ alcotest astring ]; meta = with lib; { description = "Progress bar library for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 1cb14f75fa..ef88bdcdab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; - strictDeps = true; - nativeBuildInputs = [ menhir ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix index 75b2344728..ea9a0615b4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ qcheck-alcotest ]; + checkInputs = [ qcheck-alcotest ]; meta = { description = "Functional Priority Search Queues for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix index a3c0eb55f9..edc9e1c6dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; - strictDeps = true; - buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ seq ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix index 3aafd9807a..49b1357f54 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { propagatedBuildInputs = [ react ]; - strictDeps = true; - meta = with lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = "https://github.com/ocsigen/reactiveData"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix index b4d6708467..3e517591b9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -4,6 +4,7 @@ pname = "refmterr"; nativeBuildInputs = [ + atdgen reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix index eb96298f16..1eb7625636 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix @@ -12,7 +12,7 @@ buildDunePackage { ]; doCheck = false; # tests fail with ppxlib >= 0.23.0 - nativeCheckInputs = [ + checkInputs = [ alcotest hex ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix index 432636bcbb..40356ec9aa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { # the tests fail for 4.05 doCheck = lib.versionAtLeast ocaml.version "4.06"; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { homepage = "https://github.com/burgerdev/ocaml-rfc7748"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix index 3675b89942..492e01ce5d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij"; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ coin diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix index 34f62852a8..9dd895ea4b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix @@ -1,24 +1,25 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage , alcotest , base64, cmdliner, rresult, xmlm, yojson }: buildDunePackage rec { pname = "rpclib"; - version = "8.1.0"; + version = "9.0.0"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; - sha256 = "0fbajg8wq8hjhkvvfnq68br0m0pa8zf2qzadhfgi2nnr9713rada"; + url = "https://github.com/mirage/ocaml-rpc/releases/download/${version}/rpclib-${version}.tbz"; + hash = "sha256-ziPrdWwCjZN0vRmCMpa923wjfT8FVFLTDRz30VIW6WM="; }; buildInputs = [ cmdliner yojson ]; propagatedBuildInputs = [ base64 rresult xmlm ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix index 69b2bf7499..eacdcf303c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -1,15 +1,20 @@ -{ lib, buildDunePackage, rpclib +{ lib +, buildDunePackage +, rpclib , lwt -, alcotest-lwt, ppx_deriving_rpc, yojson +, alcotest-lwt +, ppx_deriving_rpc +, yojson }: buildDunePackage { pname = "rpclib-lwt"; - inherit (rpclib) version useDune2 src; + inherit (rpclib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt rpclib ]; - nativeCheckInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; + checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; doCheck = true; meta = rpclib.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index 3184e460a9..0c1081159e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,5 +1,8 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "rresult is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-rresult"; version = "0.7.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rusage/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rusage/default.nix new file mode 100644 index 0000000000..891784ba6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rusage/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "rusage"; + version = "1.0.0"; + + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${version}/rusage-${version}.tbz"; + hash = "sha256-OgYA2Fe1goqoaOS45Z6FBJNNYN/uq+KQoUwG8KSo6Fk="; + }; + + meta = { + description = "Bindings to the GETRUSAGE(2) syscall"; + homepage = "https://github.com/CraigFe/ocaml-rusage"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix new file mode 100644 index 0000000000..f66abd2bdc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, base64 +, omd +, menhir +, ott +, linenoise +, dune-site +, pprint +, makeWrapper +, lem +, z3 +, linksem +, num +}: + +buildDunePackage rec { + pname = "sail"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "rems-project"; + repo = "sail"; + rev = version; + hash = "sha256-eNdFOSzkniNvSCZeORRJ/IYAu+9P4HSouwmhd4BQLPk="; + }; + + duneVersion = "3"; + minimalOCamlVersion = "4.08"; + + nativeBuildInputs = [ + makeWrapper + ott + menhir + lem + ]; + + propagatedBuildInputs = [ + base64 + omd + dune-site + linenoise + pprint + linksem + ]; + + preBuild = '' + rm -r aarch* # Remove code derived from non-bsd2 arm spec + rm -r snapshots # Some of this might be derived from stuff in the aarch dir, it builds fine without it + ''; + # `buildDunePackage` only builds the [pname] package + # This doesnt work in this case, as sail includes multiple packages in the same source tree + buildPhase = '' + runHook preBuild + dune build --release ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; + checkPhase = '' + runHook preCheck + dune runtest ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + runHook postCheck + ''; + installPhase = '' + runHook preInstall + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR + runHook postInstall + ''; + postInstall = '' + wrapProgram $out/bin/sail --set SAIL_DIR $out/share/sail + ''; + + meta = with lib; { + homepage = "https://github.com/rems-project/sail"; + description = "A language for describing the instruction-set architecture (ISA) semantics of processors"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix index f08f77c528..4a9a761ab3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { dune-configurator ]; - nativeCheckInputs = [ + checkInputs = [ alcotest hex ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix index d809678838..4d400d3284 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit2 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 2e4b656e63..0b4974f910 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; @@ -28,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index 75d62dd15a..e3ae1ef2e3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -27,7 +27,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix index f20a6cff0a..cfd03493d3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -3,12 +3,12 @@ buildDunePackage rec { pname = "sqlite3"; version = "5.1.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; + hash = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix index 7730a5a62b..7eca606f93 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix @@ -24,7 +24,7 @@ buildDunePackage rec { propagatedBuildInputs = [ openssl ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; preCheck = '' mkdir -p _build/default/tests/ cp tests/digicert_certificate.pem _build/default/tests/ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix index b8dcc81bfe..33e93967e1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -12,8 +12,6 @@ buildDunePackage rec { sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; }; - strictDeps = true; - # Otherwise ./configure script will run and create files conflicting with dune. dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix index 5abcdc3dcf..cec0ec8183 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { ''; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ qcheck ]; + checkInputs = [ qcheck ]; meta = { description = "Various signed and unsigned integers for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix index 95b01e5d8f..3d440cf489 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix @@ -14,7 +14,7 @@ buildDunePackage { sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv"; }; - nativeCheckInputs = [ ounit qtest ]; + checkInputs = [ ounit qtest ]; inherit doCheck; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix index 4e5ab303f5..2c12415cdb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ + checkInputs = [ qcheck ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix index a388bea4e8..0cd57ba9c8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix @@ -23,12 +23,12 @@ buildDunePackage rec { }; nativeBuildInputs = [ - bisect_ppx - ppx_cstruct pkg-config ]; propagatedBuildInputs = [ + bisect_ppx + ppx_cstruct rresult cstruct cstruct-lwt @@ -58,7 +58,7 @@ buildDunePackage rec { ]; doCheck = false; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-flow mirage-vnetif diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix index fa18ce2271..e97fb223e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ stdlib-shims uutf uucp ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest fmt ]; + checkInputs = [ alcotest fmt ]; meta = with lib; { description = "Basic utilities for interacting with terminals"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix index 564b69505d..fa6bd003ea 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7"; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix index 03c2ecca40..47f9253e44 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix @@ -1,14 +1,14 @@ -{ - lib, - fetchFromGitLab, - buildDunePackage, - bls12-381, - data-encoding, - bigstringaf, - alcotest, - alcotest-lwt, - bisect_ppx, - qcheck-alcotest, +{ lib +, fetchFromGitLab +, buildDunePackage +, bls12-381 +, data-encoding +, bigstringaf +, alcotest +, alcotest-lwt +, bisect_ppx +, qcheck-alcotest +, }: buildDunePackage rec { @@ -22,9 +22,9 @@ buildDunePackage rec { sha256 = "sha256-H1Wog3GItTIVsawr9JkyyKq+uGqbTQPTR1dacpmxLbs="; }; - propagatedBuildInputs = [bls12-381 data-encoding bigstringaf]; + propagatedBuildInputs = [ bls12-381 data-encoding bigstringaf ]; - nativeCheckInputs = [alcotest alcotest-lwt bisect_ppx qcheck-alcotest]; + checkInputs = [ alcotest alcotest-lwt bisect_ppx qcheck-alcotest ]; doCheck = false; # circular dependencies @@ -32,6 +32,6 @@ buildDunePackage rec { description = "Polynomials over BLS12-381 finite field"; license = lib.licenses.mit; homepage = "https://gitlab.com/nomadic-labs/privacy-team"; - maintainers = [lib.maintainers.ulrikstrid]; + maintainers = [ lib.maintainers.ulrikstrid ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix index 3eed3652e5..0f618f0d1e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix @@ -30,7 +30,7 @@ buildDunePackage rec { mec ]; - nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ]; + checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; doCheck = false; # circular deps diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix index c602e8a3b0..f9b78e11d3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix @@ -1,14 +1,14 @@ -{ - lib, - buildDunePackage, - hacl-star, - bls12-381, - tezos-bls12-381-polynomial, - data-encoding, - tezos-plompiler, - alcotest, - qcheck-alcotest, - bisect_ppx, +{ lib +, buildDunePackage +, hacl-star +, bls12-381 +, tezos-bls12-381-polynomial +, data-encoding +, tezos-plompiler +, alcotest +, qcheck-alcotest +, bisect_ppx +, }: buildDunePackage rec { @@ -25,7 +25,7 @@ buildDunePackage rec { tezos-plompiler ]; - nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ]; + checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; doCheck = false; # broken diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix new file mode 100644 index 0000000000..fd209741b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix @@ -0,0 +1,31 @@ +{ lib +, buildDunePackage +, ocaml +, tezos-stdlib +, lwt +, alcotest-lwt +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-lwt-result-stdlib"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib"; + + minimalOCamlVersion = "4.12"; + + propagatedBuildInputs = [ + lwt + ]; + + checkInputs = [ + alcotest-lwt + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: error-aware stdlib replacement"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index a0c22b5026..b68edba272 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest cstruct-unix ounit2 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index a7d1f573c6..354a8ca209 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { sha256 = "sha256-GqFz+bYG2ESkAEJyP8DKud4JFfU5MGLulzJa5Z4sptQ="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ] diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix index 11ee8eb6b5..efb86d8624 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { bigstring ]; - nativeCheckInputs = [ + checkInputs = [ alcotest cstruct hex diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix index b3cb4933b9..104cabfd0f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { uutf ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bigstringaf crowbar diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix index fa659699cb..f669a98c4d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ angstrom stringext ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix index 9cb66139fb..ba970b1d6c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "uri-sexp"; inherit (uri) version useDune2 src meta; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index cfadc9e5fb..476a4529f3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ${topkg.run} test runHook postCheck ''; - nativeCheckInputs = [ uucd ]; + checkInputs = [ uucd ]; meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index 0ead92d9c5..bece082f64 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; configurePlatforms = []; buildInputs = [ topkg cmdliner ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix index 8f4b4eadae..ed38329ae2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix @@ -25,11 +25,11 @@ buildDunePackage rec { buildInputs = [ angstrom ]; - strictDeps = !doCheck; - - nativeCheckInputs = [ re ]; + checkInputs = [ re ]; doCheck = true; + duneVersion = "3"; + meta = { description = "A library to normalize an ISO-8859 input to Unicode code-point"; homepage = "https://github.com/mirage/uuuu"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix index 7037432508..872d11606f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix @@ -15,11 +15,8 @@ buildDunePackage rec { sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; }; - nativeBuildInputs = [ - ppx_cstruct - ]; - propagatedBuildInputs = [ + ppx_cstruct ppx_sexp_conv lwt cstruct @@ -31,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ cmdliner ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix index 95c0c4a9dc..f7ade2ec80 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix @@ -33,7 +33,7 @@ buildDunePackage rec { xmlm ]; - nativeCheckInputs = [ + checkInputs = [ alcotest-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix index c6335ba8a9..9f8749cac9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp dispatch ptime ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index 9bfe948944..bd7a7a0fa4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { hash = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I="; }; - nativeCheckInputs = [ alcotest cstruct-unix ]; + checkInputs = [ alcotest cstruct-unix ]; propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix index 8d3810fa7e..52543175e0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { inherit (dune_3) src version; duneVersion = "3"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix index a60341f569..a3f4e0abcd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix @@ -13,11 +13,11 @@ buildDunePackage rec { hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; }; - nativeBuildInputs = [ ppx_cstruct ]; + buildInputs = [ ppx_cstruct ]; propagatedBuildInputs = [ cstruct lwt ]; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; meta = with lib; { description = "Xenstore protocol in pure OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix index 401b7ce1dc..61a5a32639 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix @@ -19,7 +19,8 @@ buildDunePackage rec { propagatedBuildInputs = [ bos ctypes ]; doCheck = true; - nativeCheckInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ]; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ fmt logs alcotest crowbar junit_alcotest ezjsonm ]; meta = { description = "Parse and generate YAML 1.1 files"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix index 44f6436154..c0582fa2a2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix @@ -19,10 +19,10 @@ buildDunePackage rec { sha256 = "0idywlkw0fbakrxv65swnr5bj7f2vns9kpay7q03gzlv82p670hy"; }; - useDune2 = true; - nativeCheckInputs = [ gcc + ]; + checkInputs = [ alcotest fmt uutf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix index e156e8cbb3..5a78809d90 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ qcheck-alcotest ]; + checkInputs = [ qcheck-alcotest ]; meta = { description = "Name pattern combinators"; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix index 2fc4b3c3b4..8005322cff 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix @@ -1,14 +1,22 @@ -{ lib, buildPerlPackage, fetchFromGitHub, makeWrapper, openssh, GitRepository, URI, XMLMini }: +{ lib +, buildPerlPackage +, fetchFromGitHub +, makeWrapper +, openssh +, GitRepository +, URI +, XMLMini +}: buildPerlPackage { pname = "ham-unstable"; - version = "2020-09-09"; + version = "2022-10-26"; src = fetchFromGitHub { owner = "kernkonzept"; repo = "ham"; - rev = "ae2a326f2efcdae0fa7c5bf0ba205b580fc91ecc"; - sha256 = "0m65pav2830y0ivwsy60dc4w457qlc0nqg43lji1kj2g96hmy2bw"; + rev = "f2f10516177d00a79fe81701351632df2544ba4e"; + hash = "sha256-cxlZh1x8ycpZIwSeOwqB6BtwYaMoWtSPaeiyW41epdk="; }; outputs = [ "out" ]; @@ -32,12 +40,12 @@ buildPerlPackage { doCheck = false; - meta = { + meta = with lib; { description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories"; homepage = "https://github.com/kernkonzept/ham"; - license = "unknown"; # should be gpl2, but not quite sure - maintainers = with lib.maintainers; [ aw ]; + license = licenses.bsd2; + maintainers = with maintainers; [ aw ]; mainProgram = "ham"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix index bdf8332760..53c09cfa01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2022.11.2"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S6dJK5ZhDCSwM/14sTrXNJ/+dDe9OeDRemsnuoe4IW0="; + hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix index cb9db9a886..982525e4bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aesedb"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TetXhDrWG6MECm/nhsZDUwcOJwP5drFO+YLarGC2pak="; + hash = "sha256-pnbzPVXr3qgBH7t5wNR+jbTdQGMdnLpV+xfgQjdc+7A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 2e878b014c..81f73d324b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.36"; + version = "9.2.37"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-PEX2SanglMqjtJHuH+gA5dnikh7qqLFiXbmrcIzs1+A="; + hash = "sha256-MFQiLOCqEAKzST7voMIQH0TYGuwICSVBcQZwUkk9S1Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix new file mode 100644 index 0000000000..fddabeccd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, aiormq +, yarl +, aiomisc +, shortuuid +}: + +buildPythonPackage rec { + pname = "aio-pika"; + version = "8.3.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = version; + sha256 = "CYfj6V/91J7JA8YSctG/FkSHRkwyLKxr27eREbA+MtQ="; + }; + + propagatedBuildInputs = [ + aiormq + yarl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ + aiomisc + shortuuid + ]; + # Tests attempt to connect to a RabbitMQ server + disabledTestPaths = [ + "tests/test_amqp.py" + "tests/test_amqp_robust.py" + "tests/test_amqp_robust_proxy.py" + "tests/test_amqps.py" + "tests/test_master.py" + "tests/test_memory_leak.py" + "tests/test_rpc.py" + "tests/test_types.py" + ]; + pythonImportsCheck = [ "aio_pika" ]; + + meta = with lib; { + description = "AMQP 0.9 client designed for asyncio and humans"; + homepage = "https://github.com/mosquito/aio-pika"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index 23fab5398d..b5d93fae31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.5.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PSXYXIWb2zTVC6kwMgkDovF+BVtEnqQh8NFPb96tFRY="; + sha256 = "sha256-tINfOGJz0v7zPh9ii7PlgzBBCXvEXif1jWLIi27FLYQ="; }; nativeCheckInputs = [ @@ -38,6 +38,8 @@ buildPythonPackage rec { --replace "--cov aioconsole --count 2" "" ''; + __darwinAllowLocalNetworking = true; + disabledTests = [ "test_interact_syntax_error" # Output and the sandbox don't work well together diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodocker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodocker/default.nix new file mode 100644 index 0000000000..b6cc55d7fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodocker/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "aiodocker"; + # unstable includes support for python 3.10+ + version = "unstable-2022-01-20"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "f1dbdc3d42147f4c2ab5e6802acf6f7d0f885be4"; + sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # tests require docker daemon + doCheck = false; + pythonImportsCheck = [ "aiodocker" ]; + + meta = with lib; { + description = "Docker API client for asyncio"; + homepage = "https://github.com/aio-libs/aiodocker"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix index a2c4eaf5ff..5d79aaa1bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix @@ -1,9 +1,9 @@ { lib , aiomisc -, asynctest , caio , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder }: @@ -22,13 +22,20 @@ buildPythonPackage rec { hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; }; + patches = [ + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch"; + hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo="; + }) + ]; + propagatedBuildInputs = [ caio ]; nativeCheckInputs = [ aiomisc - asynctest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index e29f22ba3c..e9b27ea7a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.4.4"; + version = "2.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a7i8xBlTM3DZDZBzLe/sbMR4CNx7XMxNQ6tiMI6MoTg="; + hash = "sha256-uFmQLeGPnFDABA4Uu1sL/2uUJnL+feclpGyJyISJx2E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiormq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiormq/default.nix new file mode 100644 index 0000000000..747f380266 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiormq/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pamqp +, yarl +, setuptools +, poetry-core +, aiomisc +}: + +buildPythonPackage rec { + pname = "aiormq"; + version = "6.6.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = version; + sha256 = "+zTSaQzBoIHDUQgOpD6xvoruFFHZBb0z5D6uAUo0W5A="; + }; + + nativeBuildInputs = [ + setuptools + poetry-core + ]; + + propagatedBuildInputs = [ + pamqp + yarl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ + aiomisc + ]; + # Tests attempt to connect to a RabbitMQ server + disabledTestPaths = [ + "tests/test_channel.py" + "tests/test_connection.py" + ]; + pythonImportsCheck = [ "aiormq" ]; + + meta = with lib; { + description = "AMQP 0.9.1 asynchronous client library"; + homepage = "https://github.com/mosquito/aiormq"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix index 104d404a60..ba1cbf0b7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -3,13 +3,11 @@ , fetchFromGitHub , aiohttp , prettytable -, mock -, pytestCheckHook }: buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.3"; + version = "0.0.7"; format = "setuptools"; @@ -17,26 +15,19 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-Qw0KR934GS7AuT3nRYaunypt091fZLRioVbNOp9JesY="; + hash = "sha256-NVtoQJOC4rNny95/lFk2eJ5mycNSuZrIy1GGZKYZ1VA="; }; - postPatch = '' - # https://github.com/mkmer/AIOSomecomfort/issues/1 - mv aiosomecomfort AIOSomecomfort - ''; - propagatedBuildInputs = [ aiohttp prettytable ]; - checkInputs = [ - mock - pytestCheckHook + pythonImportsCheck = [ + "aiosomecomfort" ]; - # SyntaxError in test.py - doCheck = false; + doCheck = false; # tests only run on windows, due to WindowsSelectorEventLoopPolicy meta = { description = "AsyicIO client for US models of Honeywell Thermostats"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index 0bd275f294..9fb42cd93e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.2.1"; + version = "3.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw="; + hash = "sha256-17LTNQjI2UfgtlNNkSRSWMNnhgokBXn/7KGuKo5Ai4E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 4abcad0e7c..a164cd284c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.36"; + version = "9.2.37"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-KVIrhzd3EoDIVImshfjZrBAiNkCtlFAd6Ox9ATsvPTY="; + hash = "sha256-sl3GzNMN90ez1Zks43B2How7QTaaJZbxOxK2hl/UzdQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index 6eeb158a6b..da022c1e7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.2.7"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CN7dzQodxrqr5nSwfG/4ghGEksEj0oH1bwGQUnGn/8Q="; + sha256 = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index 12c353d105..dcf426b8d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.11.0"; + version = "6.12.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NIrDVsOBem25j7aZPsF7WyNsFjEiOHWfCj8U81Q6nlA="; + hash = "sha256-u7GVOqVjuqJYfttu+pS/SAWEarAftZbnGMSPmnmpmok="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 74f24b2028..558ce409d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "7.1.0"; + version = "7.2.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0="; + sha256 = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index 08d69424e5..e204d816dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -4,6 +4,7 @@ , cython , dill , fastavro +, fasteners , fetchFromGitHub , fetchpatch , freezegun @@ -11,11 +12,12 @@ , grpcio-tools , hdfs , httplib2 +, hypothesis , lib , mock , mypy-protobuf , numpy -, oauth2client +, objsize , orjson , pandas , parameterized @@ -26,32 +28,33 @@ , pydot , pyhamcrest , pymongo +, pytest-xdist , pytestCheckHook , python , python-dateutil -, pythonAtLeast , pythonRelaxDepsHook , pytz , pyyaml +, regex , requests , requests-mock , scikit-learn -, setuptools , sqlalchemy , tenacity , testcontainers , typing-extensions +, zstandard }: buildPythonPackage rec { pname = "apache-beam"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo="; + hash = "sha256-5fnZxv2ZkFlv8vGDIt/6EL41v9P1iKa1tEd1nezq+PU="; }; patches = [ @@ -62,24 +65,22 @@ buildPythonPackage rec { hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk="; stripLen = 2; }) - (fetchpatch { - # https://github.com/apache/beam/pull/24573 - name = "relax-httplib2-version.patch"; - url = "https://github.com/apache/beam/commit/4045503575ae5ccef3de8d7b868c54e37fef658b.patch"; - hash = "sha256-YqT+sHaa1R9vLQnEQN2K0lYoCdnGoPY9qduGBpXPaek="; - stripLen = 2; - }) ]; pythonRelaxDeps = [ # See https://github.com/NixOS/nixpkgs/issues/156957 "dill" "numpy" - "pyarrow" "pymongo" # See https://github.com/NixOS/nixpkgs/issues/193613 "protobuf" + + # As of apache-beam v2.44.0, the requirement is httplib2>=0.8,<0.21.0, but + # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be + # removed once beam is upgraded since the current requirement on master is + # for httplib2>=0.8,<0.22.0. + "httplib2" ]; sourceRoot = "source/sdks/python"; @@ -94,14 +95,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ cloudpickle crcmod - cython dill fastavro + fasteners grpcio hdfs httplib2 numpy - oauth2client + objsize orjson proto-plus protobuf @@ -110,9 +111,10 @@ buildPythonPackage rec { pymongo python-dateutil pytz + regex requests - setuptools typing-extensions + zstandard ]; enableParallelBuilding = true; @@ -121,14 +123,16 @@ buildPythonPackage rec { "apache_beam" ]; - nativeCheckInputs = [ + checkInputs = [ freezegun + hypothesis mock pandas parameterized psycopg2 pyhamcrest pytestCheckHook + pytest-xdist pyyaml requests-mock scikit-learn @@ -160,6 +164,13 @@ buildPythonPackage rec { # Fails starting from dill 0.3.6 because it tries to pickle pytest globals: # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499. "apache_beam/transforms/window_test.py" + + # See https://github.com/apache/beam/issues/25390. + "apache_beam/coders/slow_coders_test.py" + "apache_beam/dataframe/pandas_doctests_test.py" + "apache_beam/typehints/typed_pipeline_test.py" + "apache_beam/coders/fast_coders_test.py" + "apache_beam/dataframe/schemas_test.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approval-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approval-utilities/default.nix new file mode 100644 index 0000000000..3b21c3ffab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/approval-utilities/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, approvaltests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "approval-utilities"; + inherit (approvaltests) version src; + disabled = pythonOlder "3.7"; + format = "setuptools"; + + postPatch = '' + mv setup.approval_utilities.py setup.py + ''; + + pythonImportsCheck = [ "approval_utilities" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Utilities for your production code that work well with approvaltests"; + homepage = "https://github.com/approvals/ApprovalTests.Python"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index e9df0a2248..066af243f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -5,10 +5,13 @@ # propagates , allpairspy +, approval-utilities , beautifulsoup4 , empty-files +, mrjob , pyperclip , pytest +, typing-extensions # tests , numpy @@ -16,26 +19,29 @@ }: buildPythonPackage rec { - version = "5.4.2"; + version = "8.1.0"; pname = "approvaltests"; format = "setuptools"; - disabled = pythonOlder "3.6.1"; + disabled = pythonOlder "3.7"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZXtIM3McpfDFCaedlbJ6SU+Er5NyfI8kGnrn7sb1V5M="; + hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA="; }; propagatedBuildInputs = [ allpairspy + approval-utilities beautifulsoup4 empty-files + mrjob pyperclip pytest + typing-extensions ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix index 894a30c7c6..7710d856fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.6.2"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-WnxH/AKi7j2u1SWVtyggUD09OqXfOST1Ayr9DrbYMcQ="; + hash = "sha256-h3YDpPreJuJpq43dHFC3ZP9coJ34lrWBdbCrGWGACsY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix index c441265377..1169e1ca34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = "refs/tags/${version}"; - hash = "sha256-oXMoDpb4tg4iYAanTfPzeFp/IQl4bIELCTdM24hM84A="; + hash = "sha256-stoxDb25K/h55rwR0faWO0AOjSJmjZNbMbOAuUE2iSM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 22a460cc27..7f7aff682b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.36"; + version = "9.2.37"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-anZsvDIH1AWaFUG5UTuyQiOKeoUB/+MSbu5pjPZJxag="; + hash = "sha256-WGc6FmrS0aVmiY5s8fUVHCT6cqcmj52H6FD2TR1HyK0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix index bdc2a078a8..8d658d2c29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix @@ -9,22 +9,13 @@ buildPythonPackage rec { pname = "argh"; - version = "0.26.2"; + version = "0.27.1"; src = fetchPypi { inherit pname version; - sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65"; + hash = "sha256-2wbZEIHxck40fM23iclXD+yUc351WvFZiDcpPgH8TNI="; }; - patches = [ - # https://github.com/neithere/argh/issues/148 - (fetchpatch { - name = "argh-0.26.2-fix-py3.9-msgs.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch?id=6f194f12a2e30aad7da347848f7b0187e188f983"; - sha256 = "nBmhF2PXVeS7cBNujzip6Bb601LRHrjmhlGKFr/++Oo="; - }) - ]; - nativeCheckInputs = [ iocapture mock @@ -34,6 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "argh" ]; meta = with lib; { + changelog = "https://github.com/neithere/argh/blob/v${version}/CHANGES"; homepage = "https://github.com/neithere/argh"; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arsenic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arsenic/default.nix new file mode 100644 index 0000000000..e2c929b251 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/arsenic/default.nix @@ -0,0 +1,70 @@ +{ lib +, aiohttp +, attrs +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonRelaxDepsHook +, pythonOlder +, structlog +}: + +buildPythonPackage rec { + pname = "arsenic"; + version = "21.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "HENNGE"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE="; + }; + + patches = [ + # Switch to poetry-core, https://github.com/HENNGE/arsenic/pull/160 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/HENNGE/arsenic/commit/ca82894a5f1e832ab9283a245258b334bdd48855.patch"; + hash = "sha256-ECCUaJF4MRmFOKH1C6HowJ+zmbEPPiS7h9DlKw5otZc="; + }) + ]; + + pythonRelaxDeps = [ + "structlog" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + structlog + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Depends on asyncio_extras which is not longer maintained + doCheck = false; + + pythonImportsCheck = [ + "arsenic" + ]; + + meta = with lib; { + description = "WebDriver implementation for asyncio and asyncio-compatible frameworks"; + homepage = "https://github.com/HENNGE/arsenic/"; + changelog = "https://github.com/HENNGE/arsenic/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix index 3e157887f6..7eab56d09b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.11"; + version = "0.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KCG+SdAtpenwDf+5nA2+p8eKrWiJQSdiRyCU+lGf/1o="; + hash = "sha256-ctTuabTfLhYJL/yv0k6oXP7JV0+qRFA0SARI3XopTeM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 68a0409d9e..4fca1b356a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -17,7 +17,7 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.26.1"; + version = "1.26.3"; pname = "azure-core"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0="; + sha256 = "sha256-rL0NqpZ1zohiPaNcgNgZza+pFzHe5rJpXGTXyp2oLbQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 45a57d1c68..1f4568f3b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "6.1.0"; + version = "7.0.0"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; + sha256 = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index 9c7a57adc0..95f1a127db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.8.1"; + version = "7.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks="; + hash = "sha256-FC4AUHWV8UxvB1Lz3/+z/l/OhdTj1YSn4iLmXt+zwZo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix deleted file mode 100644 index af6652733b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs -, buildPythonPackage -, fetchPypi -, azure-common -, cryptography -, futures ? null -, python-dateutil -, requests -, isPy3k -}: - -buildPythonPackage rec { - version = "0.36.0"; - pname = "azure-storage"; - - src = fetchPypi { - inherit pname version; - sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; - }; - - propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ] - ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - - postPatch = '' - rm azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-nspkg" "" - ''; - - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index c5188188c4..4dac7ecf5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.18.0"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-knLyjRjUmLZtM9dJoPBeSdm7GpE0+UJhwLi/obVvPuw="; + hash = "sha256-aJpSt+dXjw4S33dBiMkaR6wxzwLru+jseuPKFj2R36Y="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { disabledTestPaths = [ # requires aws s3 auth "test/integration/test_download.py" + "test/integration/test_upload.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix new file mode 100644 index 0000000000..c15c3117b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, arviz +, formulae +, graphviz +, numpy +, pandas +, pymc +, scipy +}: + +buildPythonPackage rec { + pname = "bambi"; + version = "0.9.3"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bambinos"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-f/4CrFmma+Lc6wZm+YyDupDWfPAtuRsZdRf28sYUWTk="; + }; + + propagatedBuildInputs = [ + arviz + formulae + numpy + pandas + pymc + scipy + ]; + + preCheck = ''export HOME=$(mktemp -d)''; + + nativeCheckInputs = [ graphviz pytestCheckHook ]; + disabledTests = [ + # attempt to fetch data: + "test_data_is_copied" + "test_predict_offset" + # require blackjax (not in Nixpkgs), numpyro, and jax: + "test_logistic_regression_categoric_alternative_samplers" + "test_regression_alternative_samplers" + ]; + + pythonImportsCheck = [ "bambi" ]; + + meta = with lib; { + homepage = "https://bambinos.github.io/bambi"; + description = "High-level Bayesian model-building interface"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bedup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bedup/default.nix deleted file mode 100644 index 454a972f17..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/bedup/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, btrfs-progs -, contextlib2 -, pyxdg -, pycparser -, alembic -, cffi -, pythonOlder -, isPyPy -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "bedup"; - disabled = pythonOlder "3.3"; - - src = fetchFromGitHub { - owner = "g2p"; - repo = "bedup"; - rev = "v${version}"; - sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6"; - }; - - buildInputs = [ btrfs-progs ]; - propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] - ++ lib.optionals (!isPyPy) [ cffi ]; - - meta = with lib; { - description = "Deduplication for Btrfs"; - longDescription = '' - Deduplication for Btrfs. bedup looks for new and changed files, - making sure that multiple copies of identical files share space - on disk. It integrates deeply with btrfs so that scans are - incremental and low-impact. - ''; - homepage = "https://github.com/g2p/bedup"; - license = licenses.gpl2; - maintainers = with maintainers; [ bluescreen303 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 6ac6521530..4d16dcebfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.7"; + version = "0.34.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-+4OWiIRbCLvZWt5zn2djW20PrZJK4c5KOcz4Owbkozg="; + hash = "sha256-0pSMBPUA3djl7roVyFWe6ml9OOmWooAhwNXjsBgeLmU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix new file mode 100644 index 0000000000..e4d5041e8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + python, + pbr, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "beconde-py"; + version = "4.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "bencode.py"; + sha256 = "sha256-KiTM2hclpRplCJPQtjJgE4NZ6qKZu256CZYTUKKm4Fw="; + }; + + pythonImportsCheck = [ + "bencodepy" + ]; + + nativeBuildInputs = [ + pbr + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple bencode parser (for Python 2, Python 3 and PyPy)"; + homepage = "https://github.com/fuzeman/bencode.py"; + license = licenses.bitTorrent11; + maintainers = with maintainers; [vamega]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index 91d663c6a2..d756865be2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-Efa3Z4pWn+TkpA61COQTFCl+gOc5IGqYv6ZHTqiTC2c="; + hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index 9e5b4d0fbc..69bc78ddda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "blis"; - version = "0.9.1"; + # Do not update to BLIS 0.9.x until the following issue is resolved: + # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; + hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix index 11edb88848..d6eb12166a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluemaestro-ble"; - version = "0.2.1"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QGad5o9JZ6ansVh3bRBO+9mE4PKw05acY+9+Ur2OBsY="; + hash = "sha256-mJ5JNGN4F9U3WMJQDwiZwuxE0zOirwo1sWF3/bVwXhY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 21bdad355c..65a5fc6444 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Btfya9l1UX7GbiUxuaFHT0l+pG+Dg5X0L2JS+1/VYOo="; + hash = "sha256-3qZlk6zV/AeFG4OSRONQ7EMw9Kk/yHjVHV2o64bxCGM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix index cd596cecbb..52ef0cd8ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.5"; + version = "0.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i2Ib7OGnoimiZ2R/vGe6phPhA8lEP0BJ/gP1q9RVeiU="; + hash = "sha256-fyyZ7pkNlD6MH1+SRUYjU0mXMUsZJ3qhOqJrcmJ/hgc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index a8811d7f37..05ff5762bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.36"; + version = "9.2.37"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gF8T1ZTvTjyt+kEOxI3ryDJOZv4go54VTxSGEdUyGt4="; + hash = "sha256-8kABsLp3Nrzjn7staiNfU6HdQTu1x6DNQzilMceqKVY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index e1f022c1a4..8ed14ba28c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.36"; + version = "9.2.37"; # 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 = "v${version}"; - hash = "sha256-XqoBFV87m/uz0proGDtbaewsoY8vsA6ToGwdv7xvO9Y="; + hash = "sha256-vgH8UAR8B4l29RH0dwMlGVjOHgdcOTfLMHPiKN9Z36s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix index cbd1e4615c..1de1b81d89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix @@ -1,28 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, isPy27 , attrs +, buildPythonPackage , colorlog , csvw -, python-dateutil -, tabulate +, fetchFromGitHub +, git +, isPy27 +, lxml +, markdown +, markupsafe , mock , postgresql -, pytestCheckHook +, pylatexenc , pytest-mock +, pytestCheckHook +, python-dateutil +, tabulate }: buildPythonPackage rec { pname = "clldutils"; - version = "3.9.0"; + version = "3.19.0"; disabled = isPy27; src = fetchFromGitHub { owner = "clld"; repo = pname; rev = "v${version}"; - sha256 = "07ljq7v1zvaxyl6xn4a2p4097lgd5j9bz71lf05y5bz8k024mxbr"; + sha256 = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q="; }; patchPhase = '' @@ -30,18 +35,23 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + attrs + colorlog + csvw + lxml + markdown + markupsafe + pylatexenc python-dateutil tabulate - colorlog - attrs - csvw ]; nativeCheckInputs = [ mock postgresql - pytestCheckHook pytest-mock + pytestCheckHook + git ]; disabledTests = [ @@ -54,6 +64,6 @@ buildPythonPackage rec { description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; homepage = "https://github.com/clld/clldutils"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ melling ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix new file mode 100644 index 0000000000..fdb2a1d0fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hypothesis +, numpy +, setuptools +}: + +buildPythonPackage rec { + pname = "cmaes"; + version = "0.9.1"; + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CyberAgentAILab"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-dd5vLT4Q0cI5ts0WgBpjPtOA81exGNjWSNHEiPggYbg="; + }; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ pytestCheckHook hypothesis ]; + + pythonImportsCheck = [ "cmaes" ]; + + meta = with lib; { + description = "Python library for CMA evolution strategy"; + homepage = "https://github.com/CyberAgentAILab/cmaes"; + license = licenses.mit; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix index e3ca8380c6..92ed4362ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -16,12 +16,11 @@ }: let pname = "cmsis-pack-manager"; - version = "0.5.1"; + version = "0.4.0"; src = fetchPypi { - pname = "cmsis_pack_manager"; - inherit version; - sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk="; + inherit pname version; + hash = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw="; }; native = rustPlatform.buildRustPackage { @@ -74,5 +73,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyocd/cmsis-pack-manager"; license = licenses.asl20; maintainers = with maintainers; [ frogamic sbruder ]; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix new file mode 100644 index 0000000000..af221199c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, mbstrdecoder +, typepy +, pytestCheckHook +, termcolor +}: + +buildPythonPackage rec { + pname = "dataproperty"; + version = "0.55.0"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44="; + }; + + propagatedBuildInputs = [ mbstrdecoder typepy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ termcolor ]; + + # Tests fail, even on non-nixos + pytestFlagsArray = [ + "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence" + "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal" + "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal" + ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/dataproperty"; + description = "A library for extracting properties from data"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix index 514876761e..d437c5794f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dataset"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc="; + hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix index 2b5223c044..4af53c9f75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.6"; + version = "1.1.7"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rn8RD1nnUi4MhK6QKLaP5eG6UAFrhlecimvn8sAsu6k="; + hash = "sha256-KQCjXuBDBZduNYJITwk1qx7mBp8CJ95ZbFlhrFMkE8w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix index e68cda8c0e..eec2c9fd89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix @@ -1,12 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, requests, click }: +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, requests +, click +, pythonOlder +}: buildPythonPackage rec { pname = "deep-translator"; - version = "1.9.2"; + version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iHK1A44SZqJ5N+D2ets76xuU0mryGT7TehM4wryB/AY="; + hash = "sha256-7VsEN6t9c0FMw0zHWnxnIyilQmQ127rXEfLrAYatKEc="; }; propagatedBuildInputs = [ @@ -25,9 +35,10 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Flexible, free and unlimited Python tool to translate between different languages in a simple way using multiple translators"; + description = "Python tool to translate between different languages by using multiple translators"; homepage = "https://deep-translator.readthedocs.io"; - license = licenses.mit; + changelog = "https://github.com/nidhaloff/deep-translator/releases/tag/v1.10.0"; + license = licenses.asl20; maintainers = with maintainers; [ wolfangaukang ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix index b4921b2d1f..f5ea937a4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , click , ordered-set +, orjson , clevercsv , jsonpickle , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "6.2.1"; + version = "6.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-AKah3A9srKm/cFWM7IiZ7JxQ8s0KTuh8VLKOymsDgnA="; + hash = "sha256-rlMksUi+R48fIEjVv2E3yOETDezTghZ8+Zsypu8fAnQ="; }; postPatch = '' @@ -33,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ordered-set + orjson ]; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix index 840fbda923..29e5f915cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.2"; + version = "3.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OujBpq3SBDKw9Jgb9MD200Rp0fD0OJRw90flxS22I2s="; + hash = "sha256-V5CggWp9G0/XoQhArrY3LCvfkF2SymORDWdJGjsr7yI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rq/default.nix index d0894177c3..a0bfca2a8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Na/GeQc74LCoi7Dp3HcSnmUaLi1EjyYYgZTcFyzqOQM="; + hash = "sha256-MUIwgG8GKL+V5GgiC7gZXn5tlSVrmTj/IFiP+hVB7Ks="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple app that provides django integration for RQ (Redis Queue)"; homepage = "https://github.com/rq/django-rq"; + changelog = "https://github.com/rq/django-rq/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix index 8a53a9d1d5..0b420e9362 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix @@ -1,7 +1,6 @@ { lib , autopep8 , buildPythonPackage -, contextlib2 , django , factory_boy , fetchFromGitHub @@ -72,7 +71,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - contextlib2 networkx pydot factory_boy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix index 2728d77d3f..dd6e054b55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; + hash = "sha256-hKs1BAJ31STrd5OeI1VoychWy1I8yWVXk7Zv6aPvRos="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix index f7be25f615..0eb7506a2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, poetry-core +, charset-normalizer +, tomli , untokenize , mock , pytestCheckHook @@ -9,20 +12,37 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.6"; - format = "setuptools"; + format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GSfsM6sPSLOIH0YJYFVTB3SigI62/ps51mA2iZ7GOEg="; + hash = "sha256-r+8FOl9Rrfi3V8f8wD41bRsaqDb+UrOBWuR3goK43xY="; }; + patches = [ + ./test-path.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'charset_normalizer = "^2.0.0"' 'charset_normalizer = ">=2.0.0"' + substituteInPlace tests/conftest.py \ + --subst-var-by docformatter $out/bin/docformatter + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + charset-normalizer + tomli untokenize ]; @@ -34,6 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "docformatter" ]; meta = { + changelog = "https://github.com/PyCQA/docformatter/blob/${src.rev}/CHANGELOG.md"; description = "Formats docstrings to follow PEP 257"; homepage = "https://github.com/myint/docformatter"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/test-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/test-path.patch new file mode 100644 index 0000000000..bd61c0ca82 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/test-path.patch @@ -0,0 +1,29 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index 5f5a9aa..3289222 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -92,21 +92,9 @@ def run_docformatter(arguments, temporary_file): + + Return subprocess object. + """ +- if "DOCFORMATTER_COVERAGE" in os.environ and int( +- os.environ["DOCFORMATTER_COVERAGE"] +- ): +- DOCFORMATTER_COMMAND = [ +- "coverage", +- "run", +- "--branch", +- "--parallel", +- "--omit=*/site-packages/*", +- os.environ["VIRTUAL_ENV"] + "/bin/docformatter", +- ] +- else: +- DOCFORMATTER_COMMAND = [ +- os.environ["VIRTUAL_ENV"] + "/bin/docformatter", +- ] # pragma: no cover ++ DOCFORMATTER_COMMAND = [ ++ "@docformatter@" ++ ] + + if "-" not in arguments: + arguments.append(temporary_file) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index b9c9e65a4f..301d99aabe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -2,30 +2,27 @@ , buildPythonPackage , fetchPypi , isPy27 -, contextlib2 , pytest , pytestCheckHook , vcrpy , citeproc-py , requests -, setuptools , six }: buildPythonPackage rec { pname = "duecredit"; - version = "0.9.1"; + version = "0.9.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8"; + sha256 = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; }; - # bin/duecredit requires setuptools at runtime - propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + propagatedBuildInputs = [ citeproc-py requests six ]; - nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 56a27acb60..316e20f91d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.36.2"; + version = "0.38.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HKNltc5pWc0mU+yCj/PV9E6GYQ+3fbcacRRXtquGM4w="; + hash = "sha256-xuNxsG8wMpdwyA0BkEYepnGjIZGmUzTivN5paLtM68Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index c20540b8ee..a0ab592eaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.19.0"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; + hash = "sha256-oKK+BhOgdRPZZAACgxgmr9rlzEH9yWmvbmx09d42u/Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 0aa5c65837..14876fa30d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "3.0.2"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; + hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index d444c06901..265e2f7716 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.27"; + version = "0.5.28"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-tZp3r0LALo32vmbeBOjHHg6sexpP+iq9WGRSob13mmE="; + hash = "sha256-R0iPu4aeltQ7sAhPRu48HmhtB1NezsSRHC44fUKNSEE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index d4a878b6a1..f23269a3b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.6.0"; + version = "2.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-COGzi/zK6ss47Qi2ll2e92V5WzzxdM5Z5cNmX3b1EH0="; + hash = "sha256-4g97cqMwtSLhDOVwBrunsq+JQ33BfeKcP0fJP4N48d8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix index 92c52fe5e9..e9c03b10ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.2.4"; + version = "1.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6Iwgl15adc6wK7i8sFLeSf2HSvMo/Sx/BI44qboNnRM="; + hash = "sha256-SogtdLTiTCJ8qUYsnwhPgBLFbj66EJC7L4wS64Nmuoo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index 1fd3af291f..d0ed5bb149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.27"; + version = "1.5.28"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-LFkjxcotJoHIX0GdKKqUSFF4/HSWc/sLwb34iuBrQIg="; + sha256 = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix index 9a2aef0570..0222ea21c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix @@ -1,34 +1,66 @@ { lib , buildPythonPackage -, unittestCheckHook -, fetchPypi -, flask +, fetchFromGitHub + +# build-system +, poetry-core + +# docs +, furo +, sphinxHook + +# runtime , babel +, flask , jinja2 , pytz -, speaklater + +# tests +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { - pname = "Flask-Babel"; - version = "2.0.0"; + pname = "flask-babel"; + version = "3.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + src = fetchFromGitHub { + owner = "python-babel"; + repo = "flask-babel"; + rev = "refs/tags/v${version}"; + hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk="; }; - propagatedBuildInputs = [ - flask - babel - jinja2 - pytz - speaklater + outputs = [ + "out" + "doc" ]; - unittestFlagsArray = [ "-s" "tests" ]; + nativeBuildInputs = [ + furo + poetry-core + sphinxHook + ]; + + propagatedBuildInputs = [ + babel + flask + jinja2 + pytz + ]; + + pythonImportsCheck = [ + "flask_babel" + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/python-babel/flask-babel/releases/tag/v${version}"; description = "Adds i18n/l10n support to Flask applications"; longDescription = '' Implements i18n and l10n support for Flask. @@ -36,7 +68,7 @@ buildPythonPackage rec { installed automatically for you if you install this library. ''; license = licenses.bsd2; - maintainers = teams.sage.members; + maintainers = teams.sage.members ++ (with maintainers; [ matejc ]); homepage = "https://github.com/python-babel/flask-babel"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix deleted file mode 100644 index a0e42e60c2..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, flask -, jinja2 -, speaklater -, babel -, pytz -}: - -buildPythonPackage rec { - pname = "Flask-Babel"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; - }; - - propagatedBuildInputs = [ flask jinja2 speaklater babel pytz ]; - - meta = with lib; { - description = "Adds i18n/l10n support to Flask applications"; - homepage = "https://github.com/mitsuhiko/flask-babel"; - license = licenses.bsd0; - maintainers = with maintainers; [ matejc ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index f190307828..304b567170 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -87,5 +87,8 @@ buildPythonPackage rec { homepage = "https://github.com/google/flax"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; + # Py3.10 requires orbax, tensorstore which needs packaging + # Py3.11 requires tensorboard, which is unsupported at py3.11 atm + broken = true; # At 2023-02-05 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix new file mode 100644 index 0000000000..9755fed902 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, numpy +, pandas +, scipy +}: + +buildPythonPackage rec { + pname = "formulae"; + version = "0.3.4"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bambinos"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-6IGTn3griooslN6+qRYLJiWaJhvsxa1xj1+1kQ57yN0="; + }; + + propagatedBuildInputs = [ + numpy + pandas + scipy + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + # use assertions of form `assert pytest.approx(...)`, which is now disallowed: + disabledTests = [ "test_basic" "test_degree" ]; + pythonImportsCheck = [ + "formulae" + "formulae.matrices" + ]; + + meta = with lib; { + homepage = "https://bambinos.github.io/formulae"; + description = "Formulas for mixed-effects models in Python"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix index 406beae748..183454dac8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -56,5 +56,8 @@ buildPythonPackage rec { homepage = "https://radimrehurek.com/gensim/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ jyp ]; + # python310 errors as: No matching distribution found for FuzzyTM>=0.4.0 + # python311 errors as: longintrepr.h: No such file or directory + broken = true; # At 2023-02-05 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix index 05b638559a..49d58eab82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "getmac"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "GhostofGoes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; + hash = "sha256-n4WpEbkaYUS0aGdZKO5T/cuDr5OxauiuOAAdK56/+AM="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix index b7f65f9e78..00f49fbdae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mrbean-bremen"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QHFwIfX0rSVnWgxe82zQXMwIS99CiPgprfoMbuXvXH0="; + hash = "sha256-YKGVDE1cM3Lcr9lHE2iserleob0BE3DxchdSX65CJBE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index c9615f1ca3..6d3875d378 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.22"; + version = "0.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mRI+SalWNGLEwL8UcQIrsEKOpzgat9VdmdV1E5H48aY="; + sha256 = "sha256-dcz9IEPr5n86NHne9lEDB0kERY8o+jUEqPmz6QMEF4Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 6c022b84ab..a8578492fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.17.1"; + version = "2.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA="; + hash = "sha256-VDhWYfAdU2PPzjSIhh0XMEnt9krogXV1fNTAFk6R3WM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 7c57cc560e..2de8604ccf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.17.1"; + version = "2.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o="; + hash = "sha256-RgGL9SXlmI4mcuL8phcPOCiGo2xhzRZbnpRw72U1KzI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 0cdf472be0..30a724c07c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-UBkfe4d+K+730TbvModZF1ET7uxMpQGxOkq0PF/WiWc="; + hash = "sha256-M4oxFi/PpqhJgZX/wM+9rSrraIZcqzubbxnihfK0W2E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 9245b89512..c170bc3da3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "22.9.0"; + version = "23.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-I+fnVRxkv8MjPOBElRZv2aigAOA0gGm5xoK+bFohfZA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TwGeLEfP69ZK/fkhS0sB6aPh8aDjg6Tri2mUUzk4jbk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 6b93a99a3a..cfcd3b0605 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.2.1"; + version = "2023.2.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-kTWUwHgcq+J3ok43gpXmsxmKTnrjPMzmowSkm404j4Q="; + sha256 = "sha256-DD6DZzFuAGOSJZq7PM8yhJMXdEXw6LR6KR/f5XUVZ8Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix index 5f5c984394..51902da85d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-M7mumot7OvNVFBp0kBy1qlV9zi5MmZKgow7wRDobIgY="; + hash = "sha256-sRdLuk1XW5k5wB80HiTZvb4ODNTMTOLn13aS2hkUXPs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 33348ff252..13ed586c37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -6,13 +6,13 @@ , importlib-metadata , pytestCheckHook , pythonOlder -, setuptools -, setuptools-scm +, hatch-vcs +, hatchling }: buildPythonPackage rec { pname = "humanize"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,19 +21,18 @@ buildPythonPackage rec { owner = "python-humanize"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vTfK45sZ9m7TUQJwZpQWhOXgZzO46CwCsnNP+PI1YfA="; + hash = "sha256-sI773uzh+yMiyu1ebsk6zutfyt+tfx/zT/X2AdH5Fyg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling gettext ]; - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 93cc6453f9..0450dee30b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { disabledTests = [ "test_tiff_rgb" + "test_png_gray1" # https://gitlab.mister-muffin.de/josch/img2pdf/issues/154 ]; pythonImportsCheck = [ "img2pdf" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix index 2172a88411..4c39d264ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "inkbird-ble"; - version = "0.5.5"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-KUBOjeFM4h2Qt9eT0mQKPFYJJ8OWdbYy9+AiHsJWNyU="; + hash = "sha256-re5HjPtssFkpcltCr0HEJmJyHbXJdkr2wDgaAHfy2Tk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix index 0f56965ebd..8ddb8f4b49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , fetchPypi -, fetchpatch , setuptools , setuptools-scm , requests @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "3.2.1"; + version = "3.3.0"; disabled = pythonOlder "3.7"; @@ -36,17 +35,13 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E="; + hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio="; }; - patches = [ + postPatch = '' # https://github.com/jaraco/jaraco.abode/issues/19 - (fetchpatch { - name = "specify-options-package-data.patch"; - url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch"; - hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk="; - }) - ]; + echo "graft jaraco" > MANIFEST.in + ''; nativeBuildInputs = [ setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix index 44f88d56d9..ac2a6c8125 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , flit-core +, pythonRelaxDepsHook , click , docutils , jinja2 @@ -25,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.13.1"; + version = "0.13.2"; format = "flit"; @@ -33,24 +34,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RgpC/H4J3kbdZsKuwYu7EOKCqcgM2v4uUsm6PVFknQE="; + sha256 = "sha256-wJWY0tBrlCkOFDfGZS4xWvv87sOlyrNl3fiGqgayqTs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "jsonschema<4" "jsonschema" \ - --replace "sphinx-external-toc~=0.2.3" "sphinx-external-toc" \ - --replace "sphinx-jupyterbook-latex~=0.4.6" "sphinx-jupyterbook-latex" \ - --replace "sphinx-thebe~=0.1.1" "sphinx-thebe" \ - --replace "sphinx>=4,<5" "sphinx" \ - --replace "sphinx_book_theme~=0.3.2" "sphinx_book_theme" \ - --replace "myst-nb~=0.13.1" "myst-nb" \ - --replace "docutils>=0.15,<0.18" "docutils" \ - --replace "sphinx-design~=0.1.0" "sphinx-design" \ - --replace "linkify-it-py~=1.0.1" "linkify-it-py" - ''; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ click @@ -73,11 +63,19 @@ buildPythonPackage rec { sphinx-multitoc-numbering ]; - pythonImportsCheck = [ "jupyter_book" ]; + pythonRelaxDeps = [ + "docutils" + "myst-nb" + "sphinx" + ]; + + pythonImportsCheck = [ + "jupyter_book" + ]; meta = with lib; { description = "Build a book with Jupyter Notebooks and Sphinx"; - homepage = "https://executablebooks.org/"; + homepage = "https://jupyterbook.org/"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix index 3d6b9fa933..a31f0de42e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -1,16 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pygments }: +{ lib, buildPythonPackage, fetchPypi, pygments, jupyter-packaging }: buildPythonPackage rec { pname = "jupyterlab_pygments"; - version = "0.1.2"; + version = "0.2.2"; - src = fetchFromGitHub { - owner = "jupyterlab"; - repo = pname; - rev = version; - sha256 = "02lv63qalw4x6xs70n2w2p3c2cnhk91sr961wlbi77xs0g8fcman"; + src = fetchPypi { + inherit pname version; + hash = "sha256-dAXX/eYIGdkFqfqM6J5M2DDjGM2tIqADD3qQHacFWF0="; }; + nativeBuildInputs = [ + jupyter-packaging + ]; + # no tests exist on upstream repo doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 65c56cbae1..e62b7cee01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-0B2u2xnrGc3iQ8B9iAQ3fcovQQCPqdFsn5evgdDwg5M="; + hash = "sha256-TKO0l0AKsC9MMB58ao/EXcJ9k/J3y3S9tc127H7vA6w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix new file mode 100644 index 0000000000..f1b55e0ae8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, ddt +, fetchPypi +, igraph +, igraph-c +, pythonOlder +, setuptools-scm +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "leidenalg"; + version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-flz+O2+A8yuQ9V81xo1KmQsEibEoLPP6usjNpJiJdfM="; + }; + + postPatch = '' + substituteInPlace ./setup.py \ + --replace "[\"/usr/include/igraph\", \"/usr/local/include/igraph\"]" \ + "[\"${igraph-c.dev}/include/igraph\"]" + + rm -r vendor + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + igraph + igraph-c + ]; + + checkInputs = [ + ddt + unittestCheckHook + ]; + + pythonImportsCheck = [ "leidenalg" ]; + + meta = with lib; { + description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python"; + homepage = "https://leidenalg.readthedocs.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index cf9e72c110..aa026a98eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -7,18 +7,19 @@ , pytestCheckHook , procps , tmux +, ncurses }: buildPythonPackage rec { pname = "libtmux"; - version = "0.18.1"; + version = "0.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OhNyJcnxjbyP/Kpt70qLv3ZtZvXXVTWEMcjv/pa50/4="; + hash = "sha256-nZPVS3jNz2e2LTlWiSz1fN7MzqJs/CqtAt6UVZaPPTY="; }; postPatch = '' @@ -32,14 +33,20 @@ buildPythonPackage rec { nativeCheckInputs = [ procps tmux + ncurses pytest-rerunfailures pytestCheckHook ]; - pytestFlagsArray = [ - "tests" - ] ++ lib.optionals stdenv.isDarwin [ - "--ignore=tests/test_test.py" + pytestFlagsArray = [ "tests" ]; + + disabledTests = [ + # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'. + "test_new_session_width_height" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "test_test.py" ]; pythonImportsCheck = [ "libtmux" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix index c1039db882..9fa13391b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, contextlib2 , cython , fuse , pkg-config @@ -29,8 +28,6 @@ buildPythonPackage rec { buildInputs = [ fuse ]; - propagatedBuildInputs = [ contextlib2 ]; - preConfigure = '' substituteInPlace setup.py \ --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix index 9f2e31fbc7..cab862b20c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.2.5"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; + hash = "sha256-nSa/qFJUnk1QTwUqq2il0RWCPdF4Jwby9NPIwAwcVds="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix new file mode 100644 index 0000000000..59914caf80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, chardet +, pytestCheckHook +, faker +}: + +buildPythonPackage rec { + pname = "mbstrdecoder"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-U8F+mWKDulIRvvhswmdGnxKjM2qONQybViQ5TLZbLDY="; + }; + + propagatedBuildInputs = [ chardet ]; + + nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ faker ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/mbstrdecoder"; + description = "A library for decoding multi-byte character strings"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix new file mode 100644 index 0000000000..021121a44a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix @@ -0,0 +1,151 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gfortran +, mpi +, blas +, lapack +, fftw +, hdf5-mpi +, swig +, gsl +, harminv +, libctl +, libGDSII +, openssh +, guile +, python +, numpy +, scipy +, matplotlib +, h5py-mpi +, cython +, autograd +, mpi4py +}: + +assert !blas.isILP64; +assert !lapack.isILP64; + +buildPythonPackage rec { + pname = "meep"; + version = "1.25.0"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4rIz2RXLSWzZbRuv8d4nidOa0ULYc4QHIdaYrGu1WkI="; + }; + + format = "other"; + + # MPI is needed in nativeBuildInputs too, otherwise MPI libs will be missing + # at runtime + nativeBuildInputs = [ + autoreconfHook + gfortran + pkg-config + swig + mpi + ]; + + buildInputs = [ + gsl + blas + lapack + fftw + hdf5-mpi + harminv + libctl + libGDSII + guile + gsl + ]; + + propagatedBuildInputs = [ + mpi + numpy + scipy + matplotlib + h5py-mpi + cython + autograd + mpi4py + ]; + + propagatedUserEnvPkgs = [ mpi ]; + + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + + enableParallelBuilding = true; + + preConfigure = '' + export HDF5_MPI=ON + export PYTHON=${python}/bin/${python.executable}; + ''; + + configureFlags = [ + "--without-libctl" + "--enable-shared" + "--with-mpi" + "--with-openmp" + "--enable-maintainer-mode" + ]; + + passthru = { inherit mpi; }; + + /* + This test is taken from the MEEP tutorial "Fields in a Waveguide" at + . + It is important, that the test actually performs a calculation + (calls `sim.run()`), as only then MPI will be initialised and MPI linking + errors can be caught. + */ + doCheck = true; + checkPhase = '' + export PATH=$PATH:${openssh}/bin + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + export OMP_NUM_THREADS=1 + + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + export OMPI_MCA_rmaps_base_oversubscribe=1 + + # Generate a python test script + cat > test.py << EOF + import meep as mp + cell = mp.Vector3(16,8,0) + geometry = [mp.Block(mp.Vector3(mp.inf,1,mp.inf), + center=mp.Vector3(), + material=mp.Medium(epsilon=12))] + sources = [mp.Source(mp.ContinuousSource(frequency=0.15), + component=mp.Ez, + center=mp.Vector3(-7,0))] + pml_layers = [mp.PML(1.0)] + resolution = 10 + sim = mp.Simulation(cell_size=cell, + boundary_layers=pml_layers, + geometry=geometry, + sources=sources, + resolution=resolution) + sim.run(until=200) + EOF + + ${mpi}/bin/mpiexec -np 2 python3 test.py + ''; + + meta = with lib; { + description = "Free finite-difference time-domain (FDTD) software for electromagnetic simulations"; + homepage = "https://meep.readthedocs.io/en/latest/"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix index f418cfbe9f..60f2d7329d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.23.0"; + version = "0.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-7TiXyuB2veNJtK6UmQg01O82r549aRmEa/DFzJtnQug="; + hash = "sha256-u7LQjc1N4JS9bAFaa9SnljgnldkcgK1bsjKakG0zQ2E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix index 3cb3e82b0e..1fa353260d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, stdenv +, darwin , pytestCheckHook , pythonOlder , rustPlatform @@ -21,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-Oq3jF4XeT58rad0MWmqucZZHVAshhA8PViQ+2Q9Shgc="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.libiconv + darwin.apple_sdk.frameworks.Security + ]; + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index b00a7703cf..3364398241 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.20.0"; + version = "1.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; + hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + changelog = "https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 2dac4243fe..bacf0cbf52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.26.58"; + version = "1.26.62"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AqqVFIdxR9qZbqYunT0ybWsz9GycILJvHkX9ElugNRg="; + hash = "sha256-qBf/8o/ualbYlkEK4KbYSP/kNUgK43rBxIGUDZYOz+U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix index 9b290730be..77ed843d47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nltk"; - version = "3.8"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw="; + hash = "sha256-GDTaPQaCy6Tyzt4vmq1rD6+2RhukUdsO+2+cOXmNZNM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix index 5d6b1511f1..3c3c43c7ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.90.3"; + version = "2.90.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-mh4wLRNZzLU7sWvaVQWF6fexNrXIo8FMJ1u2RtMpE/E="; + hash = "sha256-alJ0FMh2bZLHG3pUfBJDpnihreSkswQ4BizIMIXKcFc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix new file mode 100644 index 0000000000..b5be85bf11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, aiohttp +, dask +, fsspec +, numpy +, requests +, scikitimage +, s3fs +, toolz +, zarr +}: + +buildPythonPackage rec { + pname = "ome-zarr"; + version = "0.6.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ome"; + repo = "ome-zarr-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-dpweOuqruh7mAqmSaNbehLCr8OCLe1IZNWV4bpHpTl0="; + }; + + patches = [ + # remove after next release: + (fetchpatch { + name = "fix-writer-bug"; + url = "https://github.com/ome/ome-zarr-py/commit/c1302e05998dfe2faf94b0f958c92888681f5ffa.patch"; + hash = "sha256-1WANObABUXkjqeGdnmg0qJ48RcZcuAwgitZyMwiRYUw="; + }) + ]; + + propagatedBuildInputs = [ + numpy + dask + zarr + fsspec + aiohttp + requests + s3fs + scikitimage + toolz + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # attempts to access network + "test_s3_info" + ]; + + pythonImportsCheck = [ + "ome_zarr" + "ome_zarr.cli" + "ome_zarr.csv" + "ome_zarr.data" + "ome_zarr.format" + "ome_zarr.io" + "ome_zarr.reader" + "ome_zarr.writer" + "ome_zarr.scale" + "ome_zarr.utils" + ]; + + meta = with lib; { + description = "Implementation of next-generation file format (NGFF) specifications for storing bioimaging data in the cloud."; + homepage = "https://pypi.org/project/ome-zarr"; + changelog = "https://github.com/ome/ome-zarr-py/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = [ maintainers.bcdarwin ]; + mainProgram = "ome_zarr"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index a6f290633e..b21f343db3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-E7PnfSdSO52/TzDfyclZRVhZ1eNOkhxE9xLWm4Np7/k="; + sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4="; }; nativeBuildInputs = [ @@ -50,9 +50,13 @@ buildPythonPackage rec { postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in - patchShebangs tools/protoc-gen-mypy.py - substituteInPlace tools/protoc-gen-mypy.sh.in \ - --replace "/bin/bash" "${bash}/bin/bash" + patchShebangs tools/protoc-gen-mypy.sh.in + ''; + + # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set + # to lib64 and cmake incorrectly looks for the protobuf library in lib64 + preConfigure = '' + export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index d4cedc80be..ede1a7a3d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.26.4"; + version = "0.26.5"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-WcUH6zbb5kIH0qk67M+lUx9CbMEbYDXQm6IVzzuQo9w="; + hash = "sha256-eKU+WRFf7f1yH63vcoQ9dVeqhJXBqMJGpk/9AoEgR0M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openvino/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openvino/default.nix new file mode 100644 index 0000000000..20f47eb666 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/openvino/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, openvino-native +, numpy +, python +}: + +buildPythonPackage { + pname = "openvino"; + inherit (openvino-native) version; + format = "other"; + + src = openvino-native.python; + + propagatedBuildInputs = [ + numpy + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python.sitePackages} + cp -Rv * $out/${python.sitePackages}/ + + runHook postInstall + ''; + + pythonImportsCheck = [ + "ngraph" + "openvino" + "openvino.runtime" + ]; + + meta = with lib; { + description = "OpenVINO(TM) Runtime"; + homepage = "https://github.com/openvinotoolkit/openvino"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix index e373034c2a..c0f2840763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.1"; + version = "0.17.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0VZRtsh17W8h1qcGfAxE4KUehtCk1PKy3MO3fVJb4qY="; + hash = "sha256-KvvcyeYXBtV/sUKMv+1xoXH9ALUX46EWS/STFZkCnUQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ossfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ossfs/default.nix index e6d8bf28a6..f78ed6dd5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ossfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ossfs/default.nix @@ -4,22 +4,36 @@ , fsspec , oss2 , pythonOlder +, setuptools-scm +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "ossfs"; - version = "2021.8.0"; - format = "setuptools"; + version = "2023.1.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; - rev = version; - hash = "sha256-bORiE3sIDNESjEizdzsJYZTSMbcqpbjostXo+0NQDfA="; + rev = "refs/tags/${version}"; + hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonRelaxDeps = [ + "fsspec" + "oss2" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + propagatedBuildInputs = [ fsspec oss2 @@ -35,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem for Alibaba Cloud (Aliyun) Object Storage System (OSS)"; homepage = "https://github.com/fsspec/ossfs"; + changelog = "https://github.com/fsspec/ossfs/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix index e2d94ac025..c020992bee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytestCheckHook , coveralls , numpy -, contextlib2 , decopatch , more-itertools , nestedtext @@ -24,6 +24,14 @@ buildPythonPackage rec { sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; }; + patches = [ + (fetchpatch { + name = "replace contextlib2-with-contextlib.patch"; + url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; + hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; + }) + ]; + # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml @@ -38,7 +46,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - contextlib2 decopatch more-itertools nestedtext diff --git a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix index aaa62ada8b..1a9f4fef30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.21.1"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Mw9IVQoXZU8ByU6OI2Wtmo3PJuVz6KzzH7I+pPYkssQ="; + hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index c8813208d5..a096973a93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -2,8 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi , fetchFromGitHub +, setuptools , jinja2 , pygments , markupsafe @@ -14,17 +14,23 @@ buildPythonPackage rec { pname = "pdoc"; - version = "12.0.2"; + version = "12.3.1"; disabled = pythonOlder "3.7"; + format = "pyproject"; + # the Pypi version does not include tests src = fetchFromGitHub { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0="; + sha256 = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jinja2 pygments @@ -48,6 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; meta = with lib; { + changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; description = "API Documentation for Python Projects"; license = licenses.unlicense; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 38e06d362d..3e1776b97b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "11.0.4"; + version = "11.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SU8vsKwZio/5UD2SMhLenfkBjXRuMZCPo2k6+1hx8Y4="; + hash = "sha256-L4QUQsLdFwJPGq8ZdpTHRv5dNn1o6lc1q37LVNNCOOM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix new file mode 100644 index 0000000000..d86e447711 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# runtime +, cached-property +, click +, peewee + +# tests +, psycopg2 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "peewee-migrate"; + version = "1.6.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "klen"; + repo = "peewee_migrate"; + rev = "refs/tags/${version}"; + hash = "sha256-gUtxsvPj8pwzijia313d553j9U2LP5vKJHxVU1SqsV8="; + }; + + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + + propagatedBuildInputs = [ + peewee + click + ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property + ]; + + pythonImportsCheck = [ + "peewee_migrate" + ]; + + nativeCheckInputs = [ + psycopg2 + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple migration engine for Peewee"; + homepage = "https://github.com/klen/peewee_migrate"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix index d743dd24bd..2e8dcb8557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; postPatch = '' - sed -i '/pytest-runner/d setup.py + sed -i '/pytest-runner/d' setup.py ''; patches = [ @@ -33,7 +33,6 @@ buildPythonPackage rec { libespeak = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}"; # FIXME package festival }) - ./remove-intertwined-festival-test.patch ]; propagatedBuildInputs = [ @@ -44,26 +43,9 @@ buildPythonPackage rec { typing-extensions ]; - preCheck = '' - export HOME=$TMPDIR - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - # We tried to package festvial, but were unable to get the backend running, + # We tried to package festival, but were unable to get the backend running, # so let's disable related tests. - disabledTestPaths = [ - "test/test_festival.py" - ]; - - disabledTests = [ - "test_festival" - "test_festival_path" - "test_readme_festival_syll" - "test_unicode" - ]; + doCheck = false; meta = with lib; { homepage = "https://github.com/bootphon/phonemizer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch deleted file mode 100644 index a0e0817bb7..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/test/test_main.py b/test/test_main.py -index b8c53e9..8f8c6d2 100644 ---- a/test/test_main.py -+++ b/test/test_main.py -@@ -68,16 +68,11 @@ def test_readme(): - _test('hello world', 'həloʊ wɜːld ', '--verbose') - _test('hello world', 'həloʊ wɜːld ', '--quiet') - _test('hello world', 'hello world | həloʊ wɜːld ', '--prepend-text') -- _test('hello world', 'hhaxlow werld', '-b festival --strip') - _test('bonjour le monde', 'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr') - _test('bonjour le monde', 'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ', - '-l fr-fr -p " " -w ";eword "') - - --@pytest.mark.skipif( -- '2.1' in backend.FestivalBackend.version(), -- reason='festival-2.1 gives different results than further versions ' -- 'for syllable boundaries') - def test_readme_festival_syll(): - _test('hello world', - 'hh ax ;esyll l ow ;esyll ;eword w er l d ;esyll ;eword ', -diff --git a/test/test_phonemize.py b/test/test_phonemize.py -index d156c9e..2bbe371 100644 ---- a/test/test_phonemize.py -+++ b/test/test_phonemize.py -@@ -213,18 +213,6 @@ def test_segments(njobs): - ('segments', True, True, False, - ['achi acho?', '', 'achi acho'], - [u'ʌtʃɪ ʌtʃʊ?', '', u'ʌtʃɪ ʌtʃʊ ']), -- ('festival', False, False, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld ', 'guhdbay ']), -- ('festival', False, True, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld!', 'guhdbay ']), -- ('festival', True, False, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld ', '', 'guhdbay ']), -- ('festival', True, True, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld!', '', 'guhdbay ']), - ('espeak', False, False, True, - ['hello world!', '', 'goodbye'], - [('hello world!', 'həloʊ wɜːld '), ('goodbye', 'ɡʊdbaɪ ')]), -@@ -248,19 +236,7 @@ def test_segments(njobs): - [('achi acho?', u'ʌtʃɪ ʌtʃʊ '), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')]), - ('segments', True, True, True, - ['achi acho?', '', 'achi acho'], -- [('achi acho?', u'ʌtʃɪ ʌtʃʊ?'), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')]), -- ('festival', False, False, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld '), ('goodbye', 'guhdbay ')]), -- ('festival', False, True, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld!'), ('goodbye', 'guhdbay ')]), -- ('festival', True, False, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld '), ('', ''), ('goodbye', 'guhdbay ')]), -- ('festival', True, True, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld!'), ('', ''), ('goodbye', 'guhdbay ')])]) -+ [('achi acho?', u'ʌtʃɪ ʌtʃʊ?'), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')])]) - def test_preserve_empty_lines(backend, empty_lines, punctuation, prepend_text, text, expected): - language = 'cree' if backend == 'segments' else 'en-us' - -@@ -278,11 +254,7 @@ def test_preserve_empty_lines(backend, empty_lines, punctuation, prepend_text, t - ('segments', False, False, [''], []), - ('segments', False, True, [''], []), - ('segments', True, False, [''], ['']), -- ('segments', True, True, [''], ['']), -- ('festival', False, False, [''], []), -- ('festival', False, True, [''], []), -- ('festival', True, False, [''], ['']), -- ('festival', True, True, [''], [''])]) -+ ('segments', True, True, [''], [''])]) - def test_empty_input(backend, empty_lines, punctuation, text, expected): - language = 'cree' if backend == 'segments' else 'en-us' - -diff --git a/test/test_punctuation.py b/test/test_punctuation.py -index b2206ac..62e31c1 100644 ---- a/test/test_punctuation.py -+++ b/test/test_punctuation.py -@@ -28,9 +28,6 @@ ESPEAK_150 = (EspeakBackend.version() >= (1, 50)) - # True if we are using espeak>=1.49.3 - ESPEAK_143 = (EspeakBackend.version() >= (1, 49, 3)) - --# True if we are using festival>=2.5 --FESTIVAL_25 = (FestivalBackend.version() >= (2, 5)) -- - - @pytest.mark.parametrize( - 'inp, out', [ -@@ -179,9 +176,7 @@ def test_issue_54(text): - ('espeak', 'default', ['! ?', 'hey!'], ['! ?', 'heɪ!']), - ('espeak', '!', ['! ?', 'hey!'], ['! ', 'heɪ!']), - ('segments', 'default', ['! ?', 'hey!'], ['! ?', 'heːj!']), -- ('segments', '!', ['! ?', 'hey!'], ValueError), -- ('festival', 'default', ['! ?', 'hey!'], ['! ?', 'hhey!']), -- ('festival', '!', ['! ?', 'hey!'], ['! ', 'hhey!'])]) -+ ('segments', '!', ['! ?', 'hey!'], ValueError)]) - def test_issue55(backend, marks, text, expected): - if marks == 'default': - marks = Punctuation.default_marks() diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix index f9a68d98dc..8ce8e1fe95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "piccata"; - version = "2.0.0"; + version = "2.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = pname; - rev = version; - sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index c4c6edffc2..c720ea4dbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -18,16 +18,18 @@ , python-dateutil , python-xmp-toolkit , qpdf +, setuptools , setuptools-scm , substituteAll +, wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.8"; - format = "setuptools"; + version = "7.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pikepdf"; @@ -39,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-0E+kkvxT1jLfoBg3C9BfbSqfIX3K/Z5kK1kCdOks2Hk="; + hash = "sha256-sJVAiAQtJ8tU8ZHRU5jzIICnHc6RJwMsvxexnt7b4Yw="; }; patches = [ @@ -58,12 +60,14 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ - pybind11 qpdf ]; nativeBuildInputs = [ + pybind11 + setuptools setuptools-scm + wheel ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 406378addd..8657f4d28e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.12.1"; + version = "6.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iO+3spqSP/6sBxPm8j74UpzGF1Un1CuT9zdWzJQ4cpM="; + hash = "sha256-i5A2lt9FmLENRpAm75mVxfmodLQW6I56IUiE6+SnAkU="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 338c189678..0a049c18fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.27.5"; + version = "0.27.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-qEAXyWa5OjTpF4foi0ljHKbemIEHORPGE6vIVL57BOU="; + hash = "sha256-lG41y7bJkb7JdSsbv4PA2uaapkND59CDQq6Fvi+0hgU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index ea98a66792..bfb8049110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.5"; - disabled = pythonOlder "3.6"; + version = "0.12.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - sha256 = "sha256-DwWX8ztqnm/KYkiarG9KXkHcVxYE6Cc285oOMz9gkqc="; + hash = "sha256-odtMbPHty3NUqz+4UAw+8dsK6AMZer41/BAX8cK5Rek="; }; propagatedBuildInputs = [ @@ -34,11 +36,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "policy_sentry" ]; + pythonImportsCheck = [ + "policy_sentry" + ]; meta = with lib; { description = "Python module for generating IAM least privilege policies"; homepage = "https://github.com/salesforce/policy_sentry"; + changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix index b53d9108ba..9383bdbf10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.1.3"; + version = "23.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qmgfEsB3Mg6xjQxQLR2JMXATzurtuOem2kdIkD0WQXI="; + hash = "sha256-tunFd+hgaRx5wc1gRwZaNUEX550Rl1NR9rZfEWUw6H4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix index 704e8f7d26..46cef25975 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { @@ -10,7 +11,7 @@ buildPythonPackage rec { version = "0.7.16"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "ponyorm"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index e7150093bb..8c52852b98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.28.0"; + version = "5.29.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-7lO3GbVPG70u+PzS/22d6i6xIRXiTMc/iUXrZurD2LU="; + hash = "sha256-sdefoQgZ58re2VtIvNQjbjAb9aateZlGSeTAiVO6JGo="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix index ed2c0022a0..0ae3cf8bd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.1.0"; + version = "2.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-bolcqPIBHglZ7Em8/66MBypivDPehdgTaPOxAjR9Bd0="; + hash = "sha256-37JzdhMny6YDTBO9NRzfrZJAVAOPnpcr95fOKxisbTg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index d49488ffc3..2de176f2c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -3,6 +3,7 @@ , botocore , buildPythonPackage , fetchPypi +, fsspec , pandas , pythonOlder , tenacity @@ -10,19 +11,20 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.19.0"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss="; + hash = "sha256-DhG8JdYVRrsRuXsmlUzp7HDRlBsI/pLMBDzYqIzmae4="; }; propagatedBuildInputs = [ boto3 botocore + fsspec pandas tenacity ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index ef5339086f..aefb4cc43f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0="; + hash = "sha256-nFdt68QhpX1URLEQtdikR11KFK9E9Y+cTvJQn4/YZlI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix index ab7457a130..d77caf7e4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.4.0.post2301"; + version = "0.4.0.post2302"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "PyDMD"; rev = "refs/tags/v${version}"; - hash = "sha256-0ss7yyT6u0if+YjBYNbKtx5beJU43JC1LD9rqHPKBS8="; + hash = "sha256-EYVmaxwOxje3KVrNbvsjwRqQBD7Rje/JK+qB1F7EqA0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix index 472bf727ed..892c44b0b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.1.11"; + version = "3.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-RYC0mfskDcCU9O2pSKRL9ulPUaJQO9UKp7WANXZWJ60="; + hash = "sha256-FjreG+xjX8f68nUq/4HHEaYcUYjU/9sYvzmIN6kXezU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix index ab6e1e2c66..eb6fbe371b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7bQgMDmvEAvnEoHZxZ9JzYsx1JR9W5eYuvcVUmYM/dw="; + hash = "sha256-O4PNlL3lPSIyFw9MtPP678ggLBQRPedbZn1gWys7DPQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix index cf69c2b0fa..68925fe7f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { disabledTests = [ # python-memcached is not available (last release in 2017) "TestClientSocketConnect" + ] ++ lib.optionals stdenv.is32bit [ + # test_compressed_complex is broken on 32-bit platforms + # this can be removed on the next version bump + # see also https://github.com/pinterest/pymemcache/pull/480 + "test_compressed_complex" ]; pythonImportsCheck = [ @@ -53,6 +58,5 @@ buildPythonPackage rec { homepage = "https://pymemcache.readthedocs.io/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.is32bit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix index bd4ab4f023..885486cbbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.3.5"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-cxWPnq+xGDaJ1rj/K25ELATFAW+/eteilrnqrCftW0Q="; + hash = "sha256-N+WpQil/OJ2p81Dc2b6c5K03NjAUdpbS+gjPzdqLY4w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix index 5b8656bbe1..d3e7faf03c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; }; + nativeBuildInputs = [ + unixODBC # for odbc_config + ]; + buildInputs = [ unixODBC ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix new file mode 100644 index 0000000000..bbf388c56c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, poetry-core +, httpx +, pydicom +}: + +buildPythonPackage rec { + pname = "pyorthanc"; + version = "1.11.4"; + disabled = pythonOlder "3.8"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "gacou54"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-HbNeI6KpdIoLwRx09qQGJ/iJGKnRj0Z4/mkgoXhofGA="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ httpx pydicom ]; + + doCheck = false; # requires orthanc server (not in Nixpkgs) + + pythonImportsCheck = [ + "pyorthanc" + ]; + + meta = with lib; { + description = "Python library that wraps the Orthanc REST API"; + homepage = "https://github.com/gacou54/pyorthanc"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix index 327e3a92ad..9b337bf274 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.47.1"; + version = "0.48.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-c9pEO9k5tCFWLPismrXrrYEQYmxYKkciXFgpbrDEGzE="; + sha256 = "sha256-gt0jrDPr6FeLB5P9HCSosCHb/W1sAKSusTrCpkqO26E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix new file mode 100644 index 0000000000..20a5d59833 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, requests +, python +}: + +buildPythonPackage rec { + pname = "pyqwikswitch"; + version = "0.94"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc="; + }; + + propagatedBuildInputs = [ + attrs + requests + ]; + + pythonImportsCheck = [ + "pyqwikswitch" + "pyqwikswitch.threaded" + ]; + + doCheck = false; # no tests in sdist + + meta = with lib; { + description = "QwikSwitch USB Modem API binding for Python"; + homepage = "https://github.com/kellerza/pyqwikswitch"; + license = licenses.mit; + maintainers = teams.home-assistant.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix index 899e1cfd7b..8d9c546213 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,11 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub +, freezegun +, ical , parameterized , pycryptodome , pydantic , pytest-aiohttp +, pytest-asyncio +, pytest-golden +, pytest-mock , pytestCheckHook +, python-dateutil , pythonOlder , pyyaml , requests @@ -15,7 +21,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "1.1.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -24,7 +30,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e+neyzH+sGTzGwdy/N7n6GUvctHlHQgwDkRQsnzL7Jw="; + hash = "sha256-fQHWamtGA1Cz/9Hbxbns5lDd08Q01nIvaMXp9PWrelM="; }; postPatch = '' @@ -36,15 +42,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + ical pycryptodome pydantic + python-dateutil pyyaml requests ]; nativeCheckInputs = [ + freezegun parameterized pytest-aiohttp + pytest-asyncio + pytest-golden + pytest-mock pytestCheckHook requests-mock responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix index 0dbc1880be..b143a6c40f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.62"; + version = "2.0.97"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM="; + hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix new file mode 100644 index 0000000000..07461e06a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix @@ -0,0 +1,57 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, dataproperty +, mbstrdecoder +, pathvalidate +, setuptools +, tabledata +, tcolorpy +, typepy +, pytestCheckHook +, pyyaml +, toml +, elasticsearch +, dominate +}: + +buildPythonPackage rec { + pname = "pytablewriter"; + version = "0.64.2"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+IOHnmdd9g3SoHyITJJtbJ0/SAAmwWmwX5XeqsO34EM="; + }; + + propagatedBuildInputs = [ + dataproperty + mbstrdecoder + pathvalidate + tabledata + tcolorpy + typepy + ]; + + checkInputs = [ pyyaml toml elasticsearch dominate ]; + nativeCheckInputs = [ pytestCheckHook ]; + # Circular dependency + disabledTests = [ + "test_normal_from_file" + "test_normal_from_text" + "test_normal_clear_theme" + ]; + disabledTestPaths = [ + "test/writer/binary/test_excel_writer.py" + "test/writer/binary/test_sqlite_writer.py" + ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/pytablewriter"; + description = "A library to write a table in various formats"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix index 7fabc513e9..18e841f85e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -1,11 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , msgpack +, poetry-core , pytestCheckHook , pythonOlder , pyyaml , ruamel-yaml +, setuptools , toml , tomli , tomli-w @@ -13,8 +16,8 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +25,23 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; + hash = "sha256-CvcVN5DTaT8mSf2FtFrt7DHP+YLbVI15/5Vjfmgae34="; }; + patches = [ + # Switch to poetry-core, https://github.com/cdgriffith/Box/pull/247 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/cdgriffith/Box/commit/a43b98c5f5ff1074568dcef27cf17e7065d1019c.patch"; + hash = "sha256-ul/MVSzgjN3D+Vuzn7YPITaDrtS58vDmA23hy1EVF9U="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + setuptools + ]; + passthru.optional-dependencies = { all = [ msgpack @@ -64,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python dictionaries with advanced dot notation access"; homepage = "https://github.com/cdgriffith/Box"; + changelog = "https://github.com/cdgriffith/Box/blob/${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix index f48bc9c13e..2e811525c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.8"; + version = "0.9.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DgPPbro2KHF8zwbfoPSiuoYohgrbF0y/0lCnpGkoZaE="; + sha256 = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix index 3787761017..fedf919c7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.9.3"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fXfLXr8Zf3rQOkmfGx5SrbsFtw9AthohoV1NiRCOBM8="; + hash = "sha256-bHnCa7laDYi424czCGCPZuomqEOAeihjDTTW35ZTiac="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 6682b57ed7..55e11d49d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.12.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VnOQwrk2kNrmLtlzi/nyIfpFwBN4/fiWCJ2/fIoTT70="; + hash = "sha256-rVArcrXRE39K831KaK4g/n1sl3j2fL4q7FZveZUFPH0="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with GitLab API"; homepage = "https://github.com/python-gitlab/python-gitlab"; + changelog = "https://github.com/python-gitlab/python-gitlab/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Only; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index 5210bc79e7..4310b767aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "22.9.1"; + version = "23.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-V9xfPYwDDoCGJPstzYsC/ikUp45uiaZE0Bg4i9tRNhU="; + sha256 = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch new file mode 100644 index 0000000000..11b5541517 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch @@ -0,0 +1,61 @@ +From 64de7911d2938fc3601fec39c08008465b9d4f6f Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 7 Feb 2023 17:12:50 +0800 +Subject: [PATCH] python: enum: fix build for Python 3.11 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Python 3.9 introduced Py_SET_SIZE function to set size instead of +relying on Py_SIZE() as a macro [3.9]. + +Python 3.10 started to encourage to use Py_SET_SIZE instead of +assigning into return value of Py_SIZE [3.10]. + +Python 3.11 flips the switch, turn Py_SIZE into a function [3.11], +thus Py_SIZE(obj) will be a rvalue. We need to use Py_SET_SIZE +to set size now. + +[3.9]: https://docs.python.org/3.9/c-api/structures.html#c.Py_SET_SIZE +[3.10]: https://docs.python.org/3.10/c-api/structures.html#c.Py_SIZE +[3.11]: https://docs.python.org/3.11/c-api/structures.html#c.Py_SIZE + +Adapted from https://github.com/mchehab/zbar/pull/231 + +Signed-off-by: Đoàn Trần Công Danh +Signed-off-by: Nick Cao +--- + python/enum.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/python/enum.c b/python/enum.c +index dfe1b1e..4833a20 100644 +--- a/python/enum.c ++++ b/python/enum.c +@@ -52,7 +52,11 @@ enumitem_new (PyTypeObject *type, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x030900A4 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + #else +@@ -143,7 +147,11 @@ zbarEnumItem_New (PyObject *byname, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x030900A4 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + +-- +2.39.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix index 7ad125b26e..178b1899ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix @@ -1,4 +1,10 @@ -{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, zbar +, pytestCheckHook +}: buildPythonPackage rec { pname = "python-zbar"; @@ -12,6 +18,13 @@ buildPythonPackage rec { sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; }; + patches = [ + # python: enum: fix build for Python 3.11 + # https://github.com/mchehab/zbar/pull/231 + # the patch is reworked as it does not cleanly apply + ./0001-python-enum-fix-build-for-Python-3.11.patch + ]; + propagatedBuildInputs = [ pillow ]; buildInputs = [ zbar ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index b0bd470b32..d019e2b629 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy27 @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.7.2"; + version = "2.0.0"; disabled = isPy27; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-f+k7WuZRgSDGbWp/TvmDkDzT02WeycwDCd/1WhR3VD8="; + sha256 = "sha256-xarZvCRT/PhhB+ySv94XGz7uF/WiKbil6ohg7XbzOUs="; }; propagatedBuildInputs = [ @@ -56,6 +57,10 @@ buildPythonPackage rec { "test_pca" # flaky "test_distributed_classifier_loss_and_miner" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly + "test_global_embedding_space_tester" + "test_with_same_parent_label_tester" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix index 58b3ea9f2e..83ab0a9879 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "12.0.1"; + version = "13.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = "refs/tags/${version}"; - hash = "sha256-ov5Z9frYxdbPxqUedwXPYZEinCgQ0ge1jcX6UFdQMHw="; + hash = "sha256-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix index 3a6c3871a4..e639134992 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyutil"; - version = "3.3.0"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848"; + sha256 = "sha256-6hbSxVtvg0Eh3rYyp0VLCg+uJdXRMLFfa+l667B2yfw="; }; propagatedBuildInputs = [ simplejson ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 58523a13b0..20d7da5f48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.36"; + version = "9.2.37"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KV/fkgYUt8hfpGxDO3CNNrC91BaI9W8T2mr2H4eJdxo="; + hash = "sha256-JGTfOE16tycBkbsihKPgSZPlfqun1vr/86kAlNwrSZA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix index 97d2b5a83b..b238d82ec9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.24.0"; + version = "2.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-D0N7kRTzfKCxLNtRJML+xykvsv3Mv0WHdlA05eLHl3M="; + sha256 = "sha256-OZvYl8wl8kOIOfsWVn74XFKMX/jAmtoMTIEQpAZmTeo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix index 54ee52c347..a2ce4e0686 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.0.1.1"; + version = "8.0.0.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0="; + hash = "sha256-t54FUgEXEUpb3SqayY7gCmj1egavIaoXMfuShDL9dBo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qpageview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qpageview/default.nix new file mode 100644 index 0000000000..db5ea8ad1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qpageview/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, python3Packages +, pythonOlder +}: + +python3Packages.buildPythonPackage rec { + pname = "qpageview"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "frescobaldi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU="; + }; + + propagatedBuildInputs = with python3Packages; [ pyqt5 poppler-qt5 pycups ]; + + pythonImportsCheck = [ "qpageview" ]; + + meta = with lib; { + description = "A page-based viewer widget for Qt5/PyQt5"; + homepage = "https://github.com/frescobaldi/qpageview"; + changelog = "https://github.com/frescobaldi/qpageview/blob/${src.rev}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ camillemndn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix index 040148e369..830aeb2428 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-B6oLy4Ai30SGGTgGcO0V+f1mf1P1W8sMpzk7oIUtcJY="; + hash = "sha256-1tmUf0HIKufiocAZPxkTLyicMU0o8dhSjCij2Lc/lyk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index 3ec6a5e183..4a4707deda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.3.1"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-XFqZ/5eK7cYPNsWNFu8UlJfMe28qSZNFrtozB80ZcNM="; + hash = "sha256-Z1dhaGMbbg4xflJGcC6cZKCvTfB8+jDbgShMzI6T/xk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix index d67f8f364e..b240aa8150 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tedder"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Dr3i+5xTKLKOMjGkCdKhkK2BCV8/FgTGMtGsYtvB5s8="; + hash = "sha256-RbaRFMyvK3y7xN+xwNi/lHJjx+xIlpfizJj9BIn6cT4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix index a751ef1d4c..8c02dd5393 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix @@ -23,6 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-BNKcXtsBB90KQe4HXmfJ7H3yepk1dEkozSEy5v8KSAA="; }; + patches = [ + # https://github.com/aequitas/python-rflink/pull/70 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/aequitas/python-rflink/commit/ba807ddd2fde823b8d50bc50bb500a691d9e331f.patch"; + hash = "sha256-4Wh7b7j8qsvzYKdFwaY+B5Jd8EkyjAe1awlY0BDu2YA="; + }) + ]; + propagatedBuildInputs = [ async-timeout docopt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix new file mode 100644 index 0000000000..52dce6a150 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, git +, riscv-isac +, riscv-config +, jinja2 +}: + +buildPythonPackage rec { + pname = "riscof"; + version = "1.25.2"; + + src = fetchFromGitHub { + owner = "riscv-software-src"; + repo = pname; + rev = "1.25.2"; + hash = "sha256-6jiKBGj4NN038/qq3ze+L0MYpQEEaN5xt4CTWu0i4qs="; + }; + + postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython"; + + propagatedBuildInputs = [ riscv-isac riscv-config jinja2 ]; + + patches = [ + # riscof copies a template directory from the store, but breaks because it doesn't change permissions and expects it to be writeable + ./make_writeable.patch + ]; + + meta = with lib; { + homepage = "https://github.com/riscv-software-src/riscof"; + description = "RISC-V Architectural Test Framework"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscof/make_writeable.patch b/third_party/nixpkgs/pkgs/development/python-modules/riscof/make_writeable.patch new file mode 100644 index 0000000000..938f9913a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscof/make_writeable.patch @@ -0,0 +1,25 @@ +diff --git a/riscof/cli.py b/riscof/cli.py +index 26af62e..9d0ddbf 100644 +--- a/riscof/cli.py ++++ b/riscof/cli.py +@@ -502,6 +502,7 @@ def setup(dutname,refname,work_dir): + src = os.path.join(constants.root, "Templates/setup/model/") + dest = os.path.join(cwd, dutname) + distutils.dir_util.copy_tree(src, dest) ++ os.system(f"chmod +w -R '{dest}'") + + os.rename(cwd+'/'+dutname+'/model_isa.yaml', + cwd+'/'+dutname+'/'+dutname+'_isa.yaml') +@@ -525,10 +526,12 @@ def setup(dutname,refname,work_dir): + src = os.path.join(constants.root, "Templates/setup/sail_cSim/") + dest = os.path.join(cwd, refname) + distutils.dir_util.copy_tree(src, dest) ++ os.system(f"chmod +w -R '{dest}'") + else: + src = os.path.join(constants.root, "Templates/setup/reference/") + dest = os.path.join(cwd, refname) + distutils.dir_util.copy_tree(src, dest) ++ os.system(f"chmod +w -R '{dest}'") + os.rename(cwd+'/'+refname+'/riscof_model.py', + cwd+'/'+refname+'/riscof_'+refname+'.py') + with open(cwd+'/'+refname+'/riscof_'+refname+'.py', 'r') as file : diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix new file mode 100644 index 0000000000..fdfd6741f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, cerberus +, pyyaml +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "riscv-config"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "riscv-software-src"; + repo = pname; + rev = version; + hash = "sha256-HKmHrvOF4OOzoILrBJG46UOKow5gRxMcXXiI6f34dPc="; + }; + + propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; + + meta = with lib; { + homepage = "https://github.com/riscv/riscv-config"; + description = "RISC-V configuration validator"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix new file mode 100644 index 0000000000..98fff40285 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, click +, colorlog +, gitpython +, pyelftools +, pytablewriter +, pytest +, pyyaml +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "riscv-isac"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "riscv-software-src"; + repo = pname; + rev = version; + hash = "sha256-Krjr9bvpoOeNfMbYj/QbJ+Y+AVLjwrzj8KKMUXCfnMA="; + }; + + postPatch = "substituteInPlace riscv_isac/requirements.txt --replace 'pyelftools==0.26' pyelftools"; + + propagatedBuildInputs = [ + click + colorlog + gitpython + pyelftools + pytablewriter + pytest + pyyaml + ruamel-yaml + ]; + + meta = with lib; { + homepage = "https://github.com/riscv/riscv-isac"; + description = "An ISA coverage extraction tool"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix index 5c8ccfbcdd..ab52aec1a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "rising"; version = "0.3.0"; - disabled = pythonOlder "TODO"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "PhoenixDL"; @@ -32,6 +33,10 @@ buildPythonPackage rec { lightning-utilities numpy torch threadpoolctl tqdm ]; nativeCheckInputs = [ dill pytestCheckHook ]; + disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly: + "test_progressive_resize_integration" + ]; pythonImportsCheck = [ "rising" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rmsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rmsd/default.nix new file mode 100644 index 0000000000..2a0f2ecb50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rmsd/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, lib +, fetchPypi +, scipy +}: + +buildPythonPackage rec { + pname = "rmsd"; + version = "1.5.1"; + + propagatedBuildInputs = [ scipy ]; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wDQoIUMqrBDpgImHeHWizYu/YkFjlxB22TaGpA8Q0Sc="; + }; + + pythonImportsCheck = [ "rmsd" ]; + + meta = with lib; { + description = "Calculate root-mean-square deviation (RMSD) between two sets of cartesian coordinates"; + homepage = "https://github.com/charnley/rmsd"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix index 7383946dcb..cd646dd1c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.4.7"; + version = "0.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-1cTGzZ/5YgaYpSdk8nGLqgpKBNyY16fCFmrUJ+QwSDM="; + hash = "sha256-dEEo1KHtxj+xcp/2plIP2+c2jf5nFDg/mEq05T2Tpj0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 47c8734eb2..aa769a3037 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , pytest-mockito , pytestCheckHook , robotframework @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.7"; @@ -20,17 +19,9 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "v${version}"; - hash = "sha256-86o5Lh9zWo4vUF2186dN7e8tTUu5PIxM/ZukPwNl0S8="; + hash = "sha256-BgnllONYJjfeKIN8BLfMw1iZrVewtXB1KN8b9KjdtK0="; }; - patches = [ - (fetchpatch { - name = "fix-finding-version.patch"; - url = "https://github.com/robotframework/PythonLibCore/commit/84c73979e309f59de057ae6a77725ab0f468b71f.patch"; - hash = "sha256-zrjsNvXpJDLpXql200NV+QGWFLtnRVZTeAjT52dRn2s="; - }) - ]; - nativeCheckInputs = [ pytest-mockito pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix index 74810c7761..df1201fb8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "robotstatuschecker"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = "refs/tags/v${version}"; - sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; + sha256 = "sha256-7xHPqlR7IFZp3Z120mg25ZSg9eI878kE8RF1y3F5O70="; }; propagatedBuildInputs = [ robotframework ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix index aaf958d269..43f6e0bbb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rpi-gpio2"; - version = "0.3.0a3"; + version = "0.4.0"; # PyPi source does not work for some reason src = fetchFromGitHub { owner = "underground-software"; repo = "RPi.GPIO2"; - rev = "v${version}"; - hash = "sha256-8HQbEnO+4Ppo2Z3HBulbBcSKJF1bNNQYz8k6aUt65oc="; + rev = "refs/tags/v${version}"; + hash = "sha256-CNnej67yTh3C8n4cCA7NW97rlfIDrrlepRNDkv+BUeY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index f21b2fa0c7..206c38cda7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.6"; + version = "3.5.8"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-NATxAx0tj/ihACZWq445S4rBbdNMpDr2je7RAvOW53E="; + sha256 = "sha256-ImEfIbxSeYCH+5gwlwXxolz76L/Sf7/u6gHz01L92yk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix index c095ea9ca9..008813330d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage -, contextlib2 , fetchPypi , mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -19,8 +19,12 @@ buildPythonPackage rec { hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; }; - propagatedBuildInputs = [ - contextlib2 + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "contextlib2" ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index 93dc48affc..38fffa4ba8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2022.9.0"; + version = "2023.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zxK0pUfg5G5w9E+QBt1H12Ld5gWc+WakQdNVRMSFiA="; + sha256 = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix index 821cba9869..9b140ae6fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -1,38 +1,58 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, unittestCheckHook -, pytest-runner, django -, sly }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, django +, sly +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "scim2-filter-parser"; - version = "0.4.0"; - format = "setuptools"; + version = "0.5.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "15five"; repo = pname; - # gets rarely updated, we can then just replace the hash rev = "refs/tags/${version}"; - hash = "sha256-ZemR5tn+T9WWgNB1FYrPJO6zh8g9zjobFZemi+MHkEE="; + hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI="; }; + nativeBuildInputs = [ + poetry-core + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + propagatedBuildInputs = [ sly ]; + passthru.optional-dependencies = { + django-query = [ + django + ]; + }; + pythonImportsCheck = [ "scim2_filter_parser" ]; nativeCheckInputs = [ - django - pytest-runner - unittestCheckHook - ]; + mock + pytestCheckHook + ] ++ passthru.optional-dependencies.django-query; meta = with lib; { description = "A customizable parser/transpiler for SCIM2.0 filters"; - homepage = "https://github.com/15five/scim2-filter-parser"; - license = licenses.mit; + homepage = "https://github.com/15five/scim2-filter-parser"; + changelog = "https://github.com/15five/scim2-filter-parser/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; maintainers = with maintainers; [ s1341 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix index 9be77facf0..290637cb8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-splash"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f"; + sha256 = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU="; }; propagatedBuildInputs = [ scrapy six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 646db47538..62756a4eab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.7.1"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4="; + hash = "sha256-gHGsbGXxhewsdv6FCflNmf6ggFGf3CBvkIqSDV4F/kM="; }; nativeBuildInputs = [ @@ -118,12 +118,18 @@ buildPythonPackage rec { "test_xmliter_encoding" "test_download" "test_reactor_default_twisted_reactor_select" + "URIParamsSettingTest" + "URIParamsFeedOptionTest" + # flaky on darwin-aarch64 + "test_fixed_delay" + "test_start_requests_laziness" ]; postInstall = '' installManPage extras/scrapy.1 - install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy - install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy + installShellCompletion --cmd scrapy \ + --zsh extras/scrapy_zsh_completion \ + --bash extras/scrapy_bash_completion ''; pythonImportsCheck = [ @@ -143,6 +149,5 @@ buildPythonPackage rec { changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index 4e0513985a..cd33595b22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.6.4"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3V63DnMzICLZUyzcyWNa7XI0fd1kOat15cL6GPos04E="; + hash = "sha256-goziVk8OmPKkDb5oVSo/TVLLzwwqx3/Vlw0s/P9+Wss="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix index 3e9793d097..df3be2b3fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpro-ble"; - version = "0.5.1"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE="; + hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix index 3567b178bb..d51f6d7d64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.5.2"; + version = "1.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-64DywtZwfDFjW8WUzw3ZTT462sBGFgAHGc0bGnKCJpY="; + rev = "refs/tags/v${version}"; + hash = "sha256-17Yzpbcy/r+GlkLktgghehfAEboZHMbB/Dze1no4I80="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for SensorPush BLE devices"; homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble"; + changelog = "https://github.com/Bluetooth-Devices/sensorpush-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix new file mode 100644 index 0000000000..4554b36d12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, huggingface-hub +, nltk +, numpy +, scikit-learn +, scipy +, sentencepiece +, tokenizers +, torch +, torchvision +, tqdm +, transformers +}: + +buildPythonPackage rec { + pname = "sentence-transformers"; + version = "2.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "UKPLab"; + repo = "sentence-transformers"; + rev = "v${version}"; + hash = "sha256-hEYpDAL0lliaS1j+c5vaZ0q1hw802jfTUurx/FvgY9w="; + }; + + propagatedBuildInputs = [ + huggingface-hub + nltk + numpy + scikit-learn + scipy + sentencepiece + tokenizers + torch + torchvision + tqdm + transformers + ]; + + pythonImportsCheck = [ "sentence_transformers" ]; + + doCheck = false; # tests fail at build_ext + + meta = with lib; { + description = "Multilingual Sentence & Image Embeddings with BERT"; + homepage = "https://github.com/UKPLab/sentence-transformers"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix index 208e8b13a4..fce03188f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.5"; + version = "0.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw="; + hash = "sha256-1Jn785e4aLd83EHjkgB90sWi9No8wqCjUEn4ecyVl4o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix index af8724d199..b20c60c4ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "solc-select"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw="; + sha256 = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 507e75356b..e34a6babb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.2"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rzh+IASqs+uSgUq3BI9UdC4XRsozIGsaOt/LR+VhBxc="; + sha256 = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix index 4bbf606ff5..91b4e2ec7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix @@ -12,24 +12,15 @@ buildPythonPackage rec { pname = "soundfile"; - version = "0.10.3.post1"; + version = "0.11.0"; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.isi686; src = fetchPypi { - pname = "SoundFile"; - inherit version; - sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329"; + inherit pname version; + sha256 = "sha256-kxc4ock+hoTC0+HVFKxjRAzoJ+x4PqCi0+RzDj3FjBg="; }; - patches = [ - # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332 - (fetchpatch { - url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch"; - sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU="; - }) - ]; - postPatch = '' substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; @@ -38,9 +29,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy libsndfile cffi ]; propagatedNativeBuildInputs = [ cffi ]; - # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see - # https://github.com/bastibe/python-soundfile/issues/331 - doCheck = stdenv.system != "aarch64-darwin"; + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + export PYSOUNDFILE_ARCHITECTURE=x86_64 + ''; meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 6dae66a661..4fd3594b88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.4.4"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5QDPLLXxhJRhp5KPomlwN1YGm9+3FVkGUkCvbQIIsIw="; + hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix new file mode 100644 index 0000000000..795556797b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +, requests +, flit-core +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-youtube"; + version = "1.2.0"; + format = "pyproject"; + + nativeBuildInputs = [ flit-core ]; + + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "youtube"; + rev = "v${version}"; + hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A="; + }; + + propagatedBuildInputs = [ sphinx requests ]; + + # tests require internet access + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.youtube" ]; + + meta = with lib; { + description = "Youtube extension for Sphinx"; + homepage = "https://github.com/sphinx-contrib/youtube"; + maintainers = with maintainers; [ gador ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 338112f8d7..80e82d353e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -1,17 +1,21 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , file -, stdenv +, pythonOlder }: buildPythonPackage rec { pname = "sqlmap"; - version = "1.7"; + version = "1.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EQ7kdX14WkmH4b40W2sXplZdJw9SICYBpy6lPbMx8WY="; + hash = "sha256-XTLDdfNZXzqTreRan2kb0tGygdhdAW4JG3rZPKvkDfM="; }; postPatch = '' @@ -26,7 +30,9 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - pythonImportsCheck = [ "sqlmap" ]; + pythonImportsCheck = [ + "sqlmap" + ]; meta = with lib; { description = "Automatic SQL injection and database takeover tool"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix index 76c1eb22b2..da465eb0cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.0.27"; + version = "0.0.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8ymTdbJgRUf9BBNMEVF1lm29qA+N1629cekEohaxt0c="; + hash = "sha256-i1IFkibQ7VHrkD8KzeInBE4ZbjxAw8nQIeE6O4iYmbw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 96a7310cb0..15b001cf94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "5.0.0"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0="; + hash = "sha256-8tkdjj2qTzhUA8bNu2s49UgrLegrboNKMAs2NSOA5o4="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stripe Python bindings"; homepage = "https://github.com/stripe/stripe-python"; + changelog = "https://github.com/stripe/stripe-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix index 84dd9d77a8..1eed43519e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.30.0"; + version = "2.31.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ytxs7hWQa7iaBinO2nhiXhNvo7lsuhmDPnqE1K62C5k="; + sha256 = "sha256-gU6XQKiLv6E1OtSjwDunjhNIMK36//arcSsQRwuRtTY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix new file mode 100644 index 0000000000..7b9a8977a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, dataproperty +, typepy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tabledata"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6Nkdc32cp9wbmw7cnBn5VAJKfqxNunyxExuZ9b+qWNY="; + }; + + propagatedBuildInputs = [ dataproperty typepy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/tabledata"; + description = "A library to represent tabular data"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tcolorpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tcolorpy/default.nix new file mode 100644 index 0000000000..d31fb3683e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tcolorpy/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tcolorpy"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-duMbeKygEuGVcg4+gQRfClww3rs5AsmJR1VQBo7KWFY="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/tcolorpy"; + description = "A library to apply true color for terminal text"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix index 52b3be102a..0de6a2ff9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix @@ -1,16 +1,16 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , numpy , pytestCheckHook , pythonOlder , scipy -, sparse }: buildPythonPackage rec { pname = "tensorly"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,29 +18,35 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c="; + rev = "refs/tags/${version}"; + hash = "sha256-6iZvUgsoYf8fDGEuAODgfr4jCkiJwaJXlQUAsaOF9JU="; }; propagatedBuildInputs = [ numpy scipy - sparse ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # nose is not actually required for anything - # (including testing with the minimal dependencies) - substituteInPlace setup.py \ - --replace ", 'nose'" "" - ''; - pythonImportsCheck = [ "tensorly" + "tensorly.base" + "tensorly.cp_tensor" + "tensorly.tucker_tensor" + "tensorly.tt_tensor" + "tensorly.tt_matrix" + "tensorly.parafac2_tensor" + "tensorly.tenalg" + "tensorly.decomposition" + "tensorly.regression" + "tensorly.metrics" + "tensorly.random" + "tensorly.datasets" + "tensorly.plugins" + "tensorly.contrib" ]; pytestFlagsArray = [ @@ -48,6 +54,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # tries to download data: + "test_kinetic" # AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly "test_svd_time" ]; @@ -57,5 +65,6 @@ buildPythonPackage rec { homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + broken = stdenv.isLinux && stdenv.isAarch64; # test failures: test_TTOI and test_validate_tucker_rank }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix index ee2a4fb2e7..ad934e71e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.3"; + version = "0.4.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o="; + hash = "sha256-z3RrPOV7NGl3aNor+baeVivn+DKwYHcrdlM5sNMGVD0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index f3c94bbb77..e415bc17a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.6"; + version = "8.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kkHDd2HwBP5oTmN9K02Lea3eurxk40OqHLoUT60sm0c="; + hash = "sha256-Dwj20fxQ4ovxiBTKKxyAfNTVmpMNcTRZpnXghsR3mvk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix index c4164ce070..1be167f9a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tilt-ble"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-PR+BA0wUljUeUYCTRMKxkG+kj6PfklksbO/k9L7sWdE="; + rev = "refs/tags/v${version}"; + hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Tilt BLE devices"; homepage = "https://github.com/Bluetooth-Devices/tilt-ble"; + changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix index a19858c46e..2166be0511 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix @@ -4,34 +4,45 @@ , faker , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tld"; - version = "0.12.6"; + version = "0.12.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0"; + hash = "sha256-tvdynhnODrx3ugpltw1iE665UsAf9gXhKZquX7diHF4="; }; nativeCheckInputs = [ - factory_boy - faker pytestCheckHook ]; - # these tests require network access, but disabledTestPaths doesn't work. - # the file needs to be `import`ed by another python test file, so it + checkInputs = [ + factory_boy + faker + ]; + + # These tests require network access, but disabledTestPaths doesn't work. + # the file needs to be `import`ed by another Python test file, so it # can't simply be removed. preCheck = '' echo > src/tld/tests/test_commands.py ''; - pythonImportsCheck = [ "tld" ]; + + pythonImportsCheck = [ + "tld" + ]; meta = with lib; { - homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; + homepage = "https://github.com/barseghyanartur/tld"; + changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst"; # https://github.com/barseghyanartur/tld/blob/master/README.rst#license # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later license = with licenses; [ lgpl21Plus mpl11 gpl2Only ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 672a0916b2..1c191cc299 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.18.1"; + version = "3.18.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8Jw5YmHsATchcchiPqxqxA+PYgl7elqZLqG8vTu/b0k="; + sha256 = "sha256-lVoBBBrzyhrSmR2FM0xo8UJBCOShwaYOrIpeAwQn76M="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index 647bfbbafc..763fe7999c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.1.12"; + version = "2023.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-66Rg2DJg/PNkjXyKy/IgQ0T9eF+JD7rstoZKf7nwaS4="; + hash = "sha256-O2lg+5bB1MyZiL3BuQvNZfz12YQ9iE38hr1nT/gaTeo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix index 4681e4829f..4d9223f7d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.4.1"; + version = "3.7.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-q35ijx4zDR07k9al11T1H7SPYG9M8g8+rD/TNrkL2Ek="; + hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix new file mode 100644 index 0000000000..b0a505e320 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, mbstrdecoder +, python-dateutil +, pytz +, packaging +, pytestCheckHook +, tcolorpy +}: + +buildPythonPackage rec { + pname = "typepy"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-J6SgVd2m0wOVr2ZV/pryRcJrn+BYTGstAUQO349c2lE="; + }; + + propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ]; + + nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ tcolorpy ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/typepy"; + description = "A library for variable type checker/validator/converter at a run time"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix index 932a88ef75..0a059b252b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.4"; + version = "0.4.15.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YPfWJXkTE1IYVkzxudLpZ4wM5ywFHZ/6oadMdpBOWAg="; + hash = "sha256-2oToq+lcLhGtKyi6VXq45dyAhjvW+HOefBkWyVB1WvQ="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix index 275fdbaab8..2e6343da31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.5"; + version = "2.8.19.6"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; + hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix index 31906b220a..33e80f4895 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.2"; + version = "0.19.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k="; + hash = "sha256-Nv4w3lbx7OGp96mQ1H2qeBta+DHSs/Lct9/QG4V8w9Q="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix index f0b4056e2b..710e1ad32c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.3"; + version = "6.0.12.4"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w="; + sha256 = "sha256-rebjKKWj34FsR8kSwuHpRq4rrOkHRKpzER7mg0sDoxQ="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 274e69ca77..1d22826b6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11.8"; + version = "2.28.11.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5nQkUl+ErfvqtyaKFZ08Yzhi2vrhXFsZVHzhtVlU8KM="; + sha256 = "sha256-/VMKqz/E8F7jZAavFo8INubwDx7lGguWtzEfgstnUjA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 55ab0f9ee1..8b16993877 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.4"; + version = "1.26.25.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7sVVZCjuyGKxrFePtpqrOHeZWpn/7J5aEs9/vQzJ2u4="; + hash = "sha256-VjDleCRtFw2R6+OQF4jNKNU8TgRNwuJIjjsNVftoldg="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix index f3df712c3d..133c9401a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.1"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "refs/tags/v${version}"; - hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; + hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU="; }; patches = [ @@ -67,7 +67,6 @@ buildPythonPackage rec { meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; - changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix index d6747b3d72..f150984918 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wand"; - version = "0.6.10"; + version = "0.6.11"; src = fetchPypi { pname = "Wand"; inherit version; - sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc="; + sha256 = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU="; }; postPatch = '' @@ -38,9 +38,10 @@ buildPythonPackage rec { passthru.imagemagick = imagemagickBig; meta = with lib; { + changelog = "https://docs.wand-py.org/en/${version}/changes.html"; description = "Ctypes-based simple MagickWand API binding for Python"; homepage = "http://wand-py.org/"; license = [ licenses.mit ]; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ infinisil dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix index da3b4b2fc9..103f71a70a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "wasabi"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU="; + sha256 = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index c31aa264bd..82060561a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -11,6 +11,8 @@ , pytest-timeout , pytestCheckHook , python +, CoreServices +, libiconv }: buildPythonPackage rec { @@ -33,6 +35,11 @@ buildPythonPackage rec { hash = "sha256-IWONA3o+2emJ7cKEw5xYSMdWzGuUSwn1B70zUDzj7Cw="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + libiconv + ]; + nativeBuildInputs = [ ] ++ (with rustPlatform; [ cargoSetupHook @@ -69,6 +76,5 @@ buildPythonPackage rec { homepage = "https://watchfiles.helpmanual.io/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index f26c85f58f..47dfe467d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; + hash = "sha256-iAEvWFxJGf4H2PEseG+ykt9sriGyNvbmj4+NZFcPGPk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix index 7c8ce7492e..184e5fe4c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.25"; + version = "0.9.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-h4s0cJbzc5uorT9yPtXIgVDwUExUe3cNMSHCWRhN1Q4="; + hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix index 8073831843..208265ba9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "wiffi"; - version = "1.1.0"; + version = "1.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mampfes"; repo = "python-wiffi"; - rev = version; - sha256 = "sha256-uB4M3etW1DCE//V2pcmsLZbORmrL00pbPADMQD5y3CY="; + rev = "refs/tags/${version}"; + hash = "sha256-pnbzJxq8K947Yg54LysPPho6IRKf0cc+szTETgyzFao="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interface with STALL WIFFI devices"; homepage = "https://github.com/mampfes/python-wiffi"; + changelog = "https://github.com/mampfes/python-wiffi/blob/${version}/HISTORY.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index c868801e2d..7815a36396 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.15.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo="; + hash = "sha256-JsrOt6LmmhJZ4MBwLVKKt3IMbvAnxJx70AZROhb9gbc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 2d1cbab86c..af7f10e3fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G4az6YmCDv1MPF30mBQVNBPZdebjZqd+0vxo5F5iDWY="; + hash = "sha256-MSk/c2qLztq5GQ6+CzK0Jw+rOJTClguaoL284YaBPjw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index cfec72b968..00df9fc517 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , elementpath +, jinja2 , lxml , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ="; + hash = "sha256-KK1F8OVK+19ZWwu+2UtTMiVNyPPoPOv3V1qJFZAu2h4="; }; propagatedBuildInputs = [ @@ -26,28 +27,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + jinja2 lxml pytestCheckHook ]; - # Ignore broken fixtures, and tests for files which don't exist. - # For darwin, we need to explicity say we can't reach network - disabledTests = [ - "export_remote" - "element_tree_import_script" - ]; - - disabledTestPaths = [ - "tests/test_schemas.py" - "tests/test_memory.py" - "tests/test_validation.py" - ]; - pythonImportsCheck = [ "xmlschema" ]; meta = with lib; { + changelog = "https://github.com/sissaschool/xmlschema/blob/${src.rev}/CHANGELOG.rst"; description = "XML Schema validator and data conversion library for Python"; homepage = "https://github.com/sissaschool/xmlschema"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix index 6ad48ac123..d3d06d4074 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , click , click-default-group , docformatter @@ -25,6 +26,16 @@ buildPythonPackage rec { hash = "sha256-o9Xxt7b/+MkW94Jcg26ihaTn0/OpTcu+0OY7oV3JRGY="; }; + patches = [ + # https://github.com/tefra/xsdata/pull/741 + (fetchpatch { + name = "use-docformatter-1.5.1.patch"; + url = "https://github.com/tefra/xsdata/commit/040692db47e6e51028fd959c793e757858c392d7.patch"; + excludes = [ "setup.cfg" ]; + hash = "sha256-ncecMJLJUiUb4lB8ys+nyiGU/UmayK++o89h3sAwREQ="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--benchmark-skip" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index d2a113fb51..ac8c68239b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.9"; + version = "0.2.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CcvBVW9MdXVx1BnIcPB9b1PHGK2zw4Hg0vVNW6s87/Q="; + hash = "sha256-1LRnvyr3QNYR33qTyN/WepGH8InYmXWwO5gQfm20MP4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix index 8702d8edc2..f478bf1788 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Z-Wave-Me"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-M/+ij6Xjx3irZRAFlHBF+0JHaVpY+kG2i5OISneVjws="; + hash = "sha256-DfQh9wuYx/gCyW3ONk8wwDOgbp8Pifx3nwDgS5NZFhI="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to connect to a ZWave-Me instance"; homepage = "https://github.com/Z-Wave-Me/zwave-me-ws"; + changelog = "https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/quickemu/default.nix b/third_party/nixpkgs/pkgs/development/quickemu/default.nix index d5b56f585e..25cb3b4d7e 100644 --- a/third_party/nixpkgs/pkgs/development/quickemu/default.nix +++ b/third_party/nixpkgs/pkgs/development/quickemu/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-31f4BIIYCh2acbueUtGZShKnlhctd1FfKkFqsNiUqrI="; + hash = "sha256-C/3zyHnxAxCu8rrR4Znka47pVPp0vvaVGyd4TVQG3qg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index a01c053f2e..1d61428960 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -325,7 +325,6 @@ let Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw.dev ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; - classInt = lib.optional stdenv.isDarwin [ pkgs.libiconv ]; curl = [ pkgs.curl.dev ]; data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = with pkgs; [ xorg.libXft.dev ]; @@ -344,7 +343,7 @@ let graphscan = [ pkgs.gsl ]; gsl = [ pkgs.gsl ]; gert = [ pkgs.libgit2 ]; - haven = with pkgs; [ libiconv zlib.dev ]; + haven = with pkgs; [ zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; imager = [ pkgs.xorg.libX11.dev ]; @@ -362,8 +361,9 @@ let mvabund = [ pkgs.gsl ]; mwaved = [ pkgs.fftw.dev ]; mzR = with pkgs; [ zlib netcdf ]; + nanonext = with pkgs; [ mbedtls nng ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = with pkgs; [ nlopt pkg-config libiconv ]; + nloptr = with pkgs; [ nlopt pkg-config ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; pander = with pkgs; [ pandoc which ]; @@ -379,7 +379,6 @@ let RAppArmor = [ pkgs.libapparmor ]; rapportools = [ pkgs.which ]; rapport = [ pkgs.which ]; - readxl = [ pkgs.libiconv ]; rcdd = [ pkgs.gmp.dev ]; RcppCNPy = [ pkgs.zlib.dev ]; RcppGSL = [ pkgs.gsl ]; @@ -499,15 +498,6 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 - deldir = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - gam = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - interp = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - RcppArmadillo = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - quantreg = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - hexbin = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; @@ -516,7 +506,6 @@ let clustermq = [ pkgs.pkg-config ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; - RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkg-config ]; rgl = with pkgs; [ libGLU libGLU.dev libGL xorg.libX11.dev freetype.dev libpng.dev ]; @@ -555,25 +544,6 @@ let tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which xorg.xdpyinfo ]; - cluster = [ pkgs.libiconv ]; - KernSmooth = [ pkgs.libiconv ]; - nlme = [ pkgs.libiconv ]; - Matrix = [ pkgs.libiconv ]; - mgcv = [ pkgs.libiconv ]; - minqa = [ pkgs.libiconv ]; - igraph = [ pkgs.libiconv ]; - ape = [ pkgs.libiconv ]; - expm = [ pkgs.libiconv ]; - mnormt = [ pkgs.libiconv ]; - pan = [ pkgs.libiconv ]; - phangorn = [ pkgs.libiconv ]; - quadprog = [ pkgs.libiconv ]; - randomForest = [ pkgs.libiconv ]; - sundialr = [ pkgs.libiconv ]; - ucminf = [ pkgs.libiconv ]; - glmnet = [ pkgs.libiconv ]; - mvtnorm = [ pkgs.libiconv ]; - statmod = [ pkgs.libiconv ]; rsvg = [ pkgs.librsvg.dev ]; ssh = with pkgs; [ libssh ]; s2 = [ pkgs.openssl.dev ]; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix index 880fff44ed..05c069383e 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran, libiconv }: { name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ lib.optionals requireX [util-linux xvfb-run] ++ - lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; + lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran libiconv]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index 5d69cef598..312afa557d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.13"; + version = "5.0.14"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-kjAC21gZ3VKM+WFKV3tOPzIaG3t9rUSo2M3CEsA1q+I="; + sha256 = "sha256-gd7aSBNhTO1ira76lL+1apLlXYXRfGWAbGAsJEUtEqw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 8c8b0eb29a..cd2843b48c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.6.0"; + version = "10.7.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-ghGrRu7a9OUVti6P4QRrGFSmQqX8XCfn7aBHR4Q7RCI="; + sha256 = "sha256-JJGAnja/ONuUUTbLlmk/BrGa0NwJH+EfFn1yL5SvrEw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix index d340cb7562..eb23a0aae5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix @@ -11,7 +11,7 @@ buildGoModule { hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; preBuild = '' # Add go modules support diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index a7cc801c70..7a4ed91b95 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ]) + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ]; + buildInputs = with ocamlPackages; [ ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 9dba3692ad..761662053c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -44,13 +44,14 @@ stdenv.mkDerivation rec { }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; - postConfigure = "patchShebangs src/plugins/value/gen-api.sh"; - nativeBuildInputs = [ autoconf wrapGAppsHook ]; + strictDeps = true; + + nativeBuildInputs = [ autoconf wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = with ocamlPackages; [ - ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip + ncurses ltl2ba ocamlgraph yojson menhirLib camlzip lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen ppx_deriving ppx_import gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix index 3eae91e939..68e9927522 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.18"; + version = "0.19"; src = fetchurl { - sha256 = "sha256-kQL8hBkpR1ffhqic5uwwX42QqBjR8lmKE50V6xiUuPM="; url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; + hash = "sha256-KxAVe2DqCK3AjjiWtJIcc/yt1exOtlKymjQSnVAeXuA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index a3c28a0a9b..61efa78eae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.17.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-2Qr+tG1cmDF9MdsLMOnIdSGWMVAYYVgobE/SuJZRqJg="; + hash = "sha256-uHl13TNn+ero9NiL2Fnly+4H7f9eti4UoEXHKJ+DHKo="; }; - vendorHash = "sha256-P3yqDqVoC6XCX5OJ8kTvIk6Qq8X02Be51TajIkZxdbI="; + vendorHash = "sha256-mQzCqLJ3Y9l+BbfurtD/f/PRuXX+zYMeg8bPIjj05Nk="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json b/third_party/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json index 0cb5de0902..bd08b32de1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/third_party/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,20 +1,20 @@ [ { "version": "latest", - "buildId": "1.0.021731", - "publishDate": "2022-12-14T02:22:20.0230853Z", + "buildId": "1.0.022152", + "publishDate": "2023-01-24T18:38:40.5584174Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", - "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/linux/StaticSitesClient", + "sha": "40e1639efc239151b3021a262ee85a747403fbf1c9ffce3de1aa0cbf273a3069" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", - "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/windows/StaticSitesClient.exe", + "sha": "e3287b8b63b00faa501573cd205ce8f7bb9743f7107f3e4f01639d0b297f21fc" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", - "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/macOS/StaticSitesClient", + "sha": "396f5fefe087399c78521b2f5456c79e58c771ca64785e4be055a149738a2e6a" } } }, diff --git a/third_party/nixpkgs/pkgs/development/tools/b4/default.nix b/third_party/nixpkgs/pkgs/development/tools/b4/default.nix index 130d7f1d23..8ef941653e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/b4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.10.1"; + version = "0.12.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "zESWjmKz4DaiGg1VmbDlouTNm71YqIr1y9MCev72tEQ="; + sha256 = "sha256-BFvuxwcHG2KCv5LAeus50IDJ2mBCyixg3ETq9UzPmSA="; }; # tests make dns requests and fails diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index a38acbd53c..a062d18096 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -2,15 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.6.0"; + version = "3.7.0"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-qHnnUTSLY1yncqIjG+IMLoNauvgwU04qsvH7dZZ8AlI="; + sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84="; }; postPatch = '' + substituteInPlace requirements.txt \ + --replace 'phx-class-registry==4.0.5' 'phx-class-registry' substituteInPlace requirements.txt \ --replace 'tabulate==0.8.10' 'tabulate' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index fd8a78a1ac..aeec00e99a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU="; + sha256 = "sha256-ijw0JVU9jUhpIJQjcjgzAVPJDxD7WSZYiLV0OvOyS5g="; }; - vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg="; + vendorHash = "sha256-Hg8rMknanHQOgVLJ58QM9JOgrUYMqL7WvaHuiv9xVYw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix deleted file mode 100644 index be12b16518..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ /dev/null @@ -1,628 +0,0 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs -# this package (through the fixpoint glass) -, bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, gawk, gnused, gnutar, gnugrep, gzip, findutils -# updater -, python3, writeScript -# Apple dependencies -, cctools, libcxx, CoreFoundation, CoreServices, Foundation -# Allow to independently override the jdks used to build and run respectively -, buildJdk, runJdk -, buildJdkName -, runtimeShell -# Downstream packages for tests -, bazel-watcher -# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). -# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). -, enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook -, file -, substituteAll -, writeTextFile -}: - -let - version = "3.7.2"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1cfrbs23lg0jnl22ddylx3clcjw7bdpbix7r5lqibab346s5n9fy"; - }; - - # Update with `eval $(nix-build -A bazel.updater)`, - # then add new dependencies from the dict in ./src-deps.json as required. - srcDeps = lib.attrsets.attrValues srcDepsSet; - srcDepsSet = - let - srcs = lib.importJSON ./src-deps.json; - toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; - sha256 = d.sha256; - }); - in builtins.listToAttrs (map toFetchurl [ - srcs.desugar_jdk_libs - srcs.io_bazel_skydoc - srcs.bazel_skylib - srcs.io_bazel_rules_sass - srcs.platforms - # `bazel query` wants all of these to be available regardless of platform. - srcs."java_tools_javac11_darwin-v10.0.zip" - srcs."java_tools_javac11_linux-v10.0.zip" - srcs."java_tools_javac11_windows-v10.0.zip" - srcs."coverage_output_generator-v2.5.zip" - srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.19.0rc3.tar.gz" - srcs."bazel-toolchains-3.1.0.tar.gz" - srcs."com_github_grpc_grpc" - srcs.upb - srcs.rules_pkg - srcs.rules_cc - srcs.rules_java - srcs.rules_proto - srcs.com_google_protobuf - ]); - - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; - - defaultShellPath = lib.makeBinPath - # Keep this list conservative. For more exotic tools, prefer to use - # @rules_nixpkgs to pull in tools from the nix repository. Example: - # - # WORKSPACE: - # - # nixpkgs_git_repository( - # name = "nixpkgs", - # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", - # ) - # - # # This defines an external Bazel workspace. - # nixpkgs_package( - # name = "bison", - # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, - # ) - # - # some/BUILD.bazel: - # - # genrule( - # ... - # cmd = "$(location @bison//:bin/bison) -other -args", - # tools = [ - # ... - # "@bison//:bin/bison", - # ], - # ) - # - [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; - - # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - # This repository is fetched by bazel at runtime - # however it contains prebuilt java binaries, with wrong interpreter - # and libraries path. - # We prefetch it, patch it, and override it in a global bazelrc. - system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - - # on aarch64 Darwin, `uname -m` returns "arm64" - arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name; - - remote_java_tools = stdenv.mkDerivation { - name = "remote_java_tools_${system}"; - - src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip"; - - nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ gcc-unwrapped ]; - - sourceRoot = "."; - - buildPhase = '' - mkdir $out; - ''; - - installPhase = '' - cp -Ra * $out/ - touch $out/WORKSPACE - ''; - }; - - bazelRC = writeTextFile { - name = "bazel-rc"; - text = '' - startup --server_javabase=${runJdk} - - # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 - # Most commands inherit from 'build' anyway. - build --distdir=${distDir} - fetch --distdir=${distDir} - query --distdir=${distDir} - - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} - query --override_repository=${remote_java_tools.name}=${remote_java_tools} - - # Provide a default java toolchain, this will be the same as ${runJdk} - build --host_javabase='@local_jdk//:jdk' - - # load default location for the system wide configuration - try-import /etc/bazel.bazelrc - ''; - }; - -in -stdenv.mkDerivation rec { - pname = "bazel"; - inherit version; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel/"; - description = "Build tool that builds code quickly and reliably"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - ]; - license = licenses.asl20; - maintainers = lib.teams.bazel.members; - inherit platforms; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; - - inherit src; - sourceRoot = "."; - - patches = [ - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' - # This is breaking the build of any C target. This patch removes the last - # argument if it's found to be an empty string. - ../trim-last-argument-to-gcc-if-empty.patch - - # On Darwin, using clang 6 to build fails because of a linker error (see #105573), - # but using clang 7 fails because libarclite_macosx.a cannot be found when linking - # the xcode_locator tool. - # This patch removes using the -fobjc-arc compiler option and makes the code - # compile without automatic reference counting. Caveat: this leaks memory, but - # we accept this fact because xcode_locator is only a short-lived process used during the build. - ./no-arc.patch - - ./gcc11.patch - - # --experimental_strict_action_env (which may one day become the default - # see bazelbuild/bazel#2574) hardcodes the default - # action environment to a non hermetic value (e.g. "/usr/local/bin"). - # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. - # So we are replacing this bazel paths by defaultShellPath, - # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; - strictActionEnvPatch = defaultShellPath; - }) - - # bazel reads its system bazelrc in /etc - # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; - bazelSystemBazelRCPath = bazelRC; - }) - - # disable suspend detection during a build inside Nix as this is - # not available inside the darwin sandbox - ../bazel_darwin_sandbox.patch - ] ++ lib.optional enableNixHacks ../nix-hacks.patch; - - - # Additional tests that check bazel’s functionality. Execute - # - # nix-build . -A bazel.tests - # - # in the nixpkgs checkout root to exercise them locally. - passthru.tests = - let - runLocal = name: attrs: script: - let - attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 ] ++ (attrs.buildInputs or []); - in - runCommandCC name ({ - inherit buildInputs; - preferLocalBuild = true; - meta.platforms = platforms; - } // attrs') script; - - # bazel wants to extract itself into $install_dir/install every time it runs, - # so let’s do that only once. - extracted = bazelPkg: - let install_dir = - # `install_base` field printed by `bazel info`, minus the hash. - # yes, this path is kinda magic. Sorry. - "$HOME/.cache/bazel/_bazel_nixbld"; - in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' - export HOME=$(mktemp -d) - touch WORKSPACE # yeah, everything sucks - install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" - # assert it’s actually below install_dir - [[ "$install_base" =~ ${install_dir} ]] \ - || (echo "oh no! $install_base but we are \ - trying to copy ${install_dir} to $out instead!"; exit 1) - cp -R ${install_dir} $out - ''; - - bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: - let - be = extracted bazelPkg; - in runLocal name { inherit buildInputs; } ( - # skip extraction caching on Darwin, because nobody knows how Darwin works - (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - # set up home with pre-unpacked bazel - export HOME=$(mktemp -d) - mkdir -p ${be.install_dir} - cp -R ${be}/install ${be.install_dir} - - # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 - # Bazel checks whether the mtime of the install dir files - # is >9 years in the future, otherwise it extracts itself again. - # see PosixFileMTime::IsUntampered in src/main/cpp/util - # What the hell bazel. - ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} - '') - + - '' - # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 - # about why to create a subdir for the workspace. - cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - - ${bazelScript} - - touch $out - ''); - - bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; - - bazel-examples = fetchFromGitHub { - owner = "bazelbuild"; - repo = "examples"; - rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; - sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; - }; - - in (if !stdenv.hostPlatform.isDarwin then { - # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; - } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - # downstream packages using buildBazelPackage - # fixed-output hashes of the fetch phase need to be spot-checked manually - downstream = recurseIntoAttrs ({ - inherit bazel-watcher; - }); - }; - - # update the list of workspace dependencies - passthru.updater = writeScript "update-bazel-deps.sh" '' - #!${runtimeShell} - cat ${runCommand "bazel-deps.json" {} '' - ${unzip}/bin/unzip ${src} WORKSPACE - ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out - ''} > ${builtins.toString ./src-deps.json} - ''; - - # Necessary for the tests to pass on Darwin with sandbox enabled. - # Bazel starts a local server and needs to bind a local address. - __darwinAllowLocalNetworking = true; - - # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. - customBash = writeCBin "bash" '' - #include - #include - #include - #include - - extern char **environ; - - int main(int argc, char *argv[]) { - char *path = getenv("PATH"); - char *pathToAppend = "${defaultShellPath}"; - char *newPath; - if (path != NULL) { - int length = strlen(path) + 1 + strlen(pathToAppend) + 1; - newPath = malloc(length * sizeof(char)); - snprintf(newPath, length, "%s:%s", path, pathToAppend); - } else { - newPath = pathToAppend; - } - setenv("PATH", newPath, 1); - execve("${bash}/bin/bash", argv, environ); - return 0; - } - ''; - - postPatch = let - - darwinPatches = '' - bazelLinkFlags () { - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done - } - - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - - # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails - export GCOV=${coreutils}/bin/false - - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" - - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD - - substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" - - # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead - sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc - - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - ''; - - genericPatches = '' - # Substitute j2objc and objc wrapper's python shebang to plain python path. - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" - - # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|g' \ - src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh - - # replace initial value of pythonShebang variable in BazelPythonSemantics.java - substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ - --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" - - # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do - # If you add more replacements here, you must change the grep above! - # Only files containing /bin are taken into account. - substituteInPlace "$path" \ - --replace /bin/bash ${customBash}/bin/bash \ - --replace "/usr/bin/env bash" ${customBash}/bin/bash \ - --replace "/usr/bin/env python" ${python3}/bin/python \ - --replace /usr/bin/env ${coreutils}/bin/env \ - --replace /bin/true ${coreutils}/bin/true - done - - # bazel test runner include references to /bin/bash - substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${customBash}/bin/bash - - for i in $(find tools/cpp/ -type f) - do - substituteInPlace $i \ - --replace /bin/bash ${customBash}/bin/bash - done - - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${customBash}/bin/bash - - # add nix environment vars to .bazelrc - cat >> .bazelrc <> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - - patchShebangs . - ''; - in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches - + genericPatches; - - buildInputs = [ - buildJdk - python3 - ]; - - # when a command can’t be found in a bazel build, you might also - # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - installShellFiles - zip - python3 - unzip - makeWrapper - which - customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; - - # Bazel makes extensive use of symlinks in the WORKSPACE. - # This causes problems with infinite symlinks if the build output is in the same location as the - # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a - # subdirectory. - # Failing to do this causes "infinite symlink expansion detected" - preBuildPhases = ["preBuildPhase"]; - preBuildPhase = '' - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - ''; - - buildPhase = '' - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" - ./bazel_src/compile.sh - ./bazel_src/scripts/generate_bash_completion.sh \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.bash \ - --prepend=./bazel_src/scripts/bazel-complete-header.bash \ - --prepend=./bazel_src/scripts/bazel-complete-template.bash - - # need to change directory for bazel to find the workspace - cd ./bazel_src - # build execlog tooling - export HOME=$(mktemp -d) - ./output/bazel build src/tools/execlog:parser_deploy.jar - cd - - ''; - - installPhase = '' - mkdir -p $out/bin - - # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} - # The binary _must_ exist with this naming if your project contains a .bazelversion - # file. - cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - - mkdir $out/share - cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar - mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} - cat < $out/bin/bazel-execlog - #!${runtimeShell} -e - ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ - EOF - chmod +x $out/bin/bazel-execlog - - # shell completion files - installShellCompletion --bash \ - --name bazel.bash \ - ./bazel_src/output/bazel-complete.bash - installShellCompletion --zsh \ - --name _bazel \ - ./bazel_src/scripts/zsh_completion/_bazel - installShellCompletion --fish \ - --name bazel.fish \ - ./bazel_src/scripts/fish/completions/bazel.fish - ''; - - doInstallCheck = true; - installCheckPhase = '' - export TEST_TMPDIR=$(pwd) - - hello_test () { - $out/bin/bazel test \ - --test_output=errors \ - --java_toolchain='${javaToolchain}' \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - } - - cd ./bazel_src - - # test whether $WORKSPACE_ROOT/tools/bazel works - - mkdir -p tools - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exit 1 - EOF - chmod +x tools/bazel - - # first call should fail if tools/bazel is used - ! hello_test - - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exec "$BAZEL_REAL" "$@" - EOF - - # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} - hello_test - ''; - - # Save paths to hardcoded dependencies so Nix can detect them. - postFixup = '' - mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends - # The templates get tar’d up into a .jar, - # so nix can’t detect python is needed in the runtime closure - echo "${python3}" >> $out/nix-support/depends - # The string literal specifying the path to the bazel-rc file is sometimes - # stored non-contiguously in the binary due to gcc optimisations, which leads - # Nix to miss the hash when scanning for dependencies - echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' - echo "${cctools}" >> $out/nix-support/depends - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch deleted file mode 100644 index 450bcd1147..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc -index 6e3a908..030e9ca 100644 ---- a/third_party/ijar/mapped_file_unix.cc -+++ b/third_party/ijar/mapped_file_unix.cc -@@ -19,6 +19,7 @@ - #include - - #include -+#include - - #include "third_party/ijar/mapped_file.h" - -diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h -index ed66163..c4b051e 100644 ---- a/third_party/ijar/zlib_client.h -+++ b/third_party/ijar/zlib_client.h -@@ -16,6 +16,7 @@ - #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ - - #include -+#include - - #include "third_party/ijar/common.h" - diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch deleted file mode 100644 index 012e613c2f..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 -+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 -@@ -21,10 +21,6 @@ - // 6,6.4,6.4.1 = 6.4.1 - // 6.3,6.3.0 = 6.3 - --#if !defined(__has_feature) || !__has_feature(objc_arc) --#error "This file requires ARC support." --#endif -- - #import - #import - ---- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 -+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 -@@ -123,7 +123,6 @@ - "macosx", - "clang", - "-mmacosx-version-min=10.9", -- "-fobjc-arc", - "-framework", - "CoreServices", - "-framework", ---- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 -+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 -@@ -27,7 +27,7 @@ - ]) - - DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ -- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ -+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ - -framework Foundation -o $@ $< - """ - diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json deleted file mode 100644 index 96553d9d88..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json +++ /dev/null @@ -1,861 +0,0 @@ -{ - "1.25.0.zip": { - "name": "1.25.0.zip", - "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", - "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" - ] - }, - "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { - "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" - ] - }, - "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": { - "name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", - "sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz" - ] - }, - "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { - "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, - "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { - "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": { - "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" - ] - }, - "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz": { - "name": "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", - "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", - "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz" - ] - }, - "android_tools_for_testing": { - "name": "android_tools_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" - }, - "android_tools_pkg-0.19.0rc3.tar.gz": { - "name": "android_tools_pkg-0.19.0rc3.tar.gz", - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" - ] - }, - "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { - "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" - ] - }, - "bazel-toolchains-3.1.0.tar.gz": { - "name": "bazel-toolchains-3.1.0.tar.gz", - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", - "strip_prefix": "j2objc-2.5", - "urls": [ - "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", - "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" - ] - }, - "bazel_skylib": { - "name": "bazel_skylib", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96", - "strip_prefix": "bazel-skylib-2d4c9528e0f453b5950eeaeac11d8d09f5a504d4", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz" - ] - }, - "bazel_toolchains": { - "name": "bazel_toolchains", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "strip_prefix": "bazel-toolchains-3.1.0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, - "bazel_website": { - "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", - "name": "bazel_website", - "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", - "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", - "urls": [ - "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" - ] - }, - "build_bazel_rules_nodejs": { - "name": "build_bazel_rules_nodejs", - "sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz", - "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" - ] - }, - "com_github_grpc_grpc": { - "name": "com_github_grpc_grpc", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/grpc:grpc_1.26.0.patch" - ], - "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", - "strip_prefix": "grpc-1.26.0", - "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz" - ] - }, - "com_google_googletest": { - "name": "com_google_googletest", - "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", - "strip_prefix": "googletest-release-1.10.0", - "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", - "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" - ] - }, - "com_google_protobuf": { - "name": "com_google_protobuf", - "patch_args": [ - "-p1" - ], - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "patches": [ - "//third_party/protobuf:3.13.0.patch" - ], - "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", - "strip_prefix": "protobuf-3.13.0", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" - ] - }, - "coverage_output_generator-v2.5.zip": { - "name": "coverage_output_generator-v2.5.zip", - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "desugar_jdk_libs": { - "name": "desugar_jdk_libs", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { - "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { - "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "urls": [ - "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" - ] - }, - "io_bazel_rules_sass": { - "name": "io_bazel_rules_sass", - "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", - "strip_prefix": "rules_sass-1.25.0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", - "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" - ] - }, - "io_bazel_skydoc": { - "name": "io_bazel_skydoc", - "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", - "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" - ] - }, - "java_tools_javac11_darwin-v10.0.zip": { - "name": "java_tools_javac11_darwin-v10.0.zip", - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "java_tools_javac11_linux-v10.0.zip": { - "name": "java_tools_javac11_linux-v10.0.zip", - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "java_tools_javac11_windows-v10.0.zip": { - "name": "java_tools_javac11_windows-v10.0.zip", - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "java_tools_langtools_javac11": { - "name": "java_tools_langtools_javac11", - "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" - ] - }, - "openjdk11_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_darwin_archive", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "openjdk11_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_linux_archive", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "openjdk11_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_windows_archive", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "openjdk14_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_darwin_archive", - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "openjdk14_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_linux_archive", - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "openjdk14_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_windows_archive", - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "openjdk_linux": { - "downloaded_file_path": "zulu-linux.tar.gz", - "name": "openjdk_linux", - "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" - ] - }, - "openjdk_linux_aarch64": { - "downloaded_file_path": "zulu-linux-aarch64.tar.gz", - "name": "openjdk_linux_aarch64", - "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" - ] - }, - "openjdk_linux_aarch64_minimal": { - "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", - "name": "openjdk_linux_aarch64_minimal", - "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" - ] - }, - "openjdk_linux_aarch64_vanilla": { - "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", - "name": "openjdk_linux_aarch64_vanilla", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "openjdk_linux_minimal": { - "downloaded_file_path": "zulu-linux-minimal.tar.gz", - "name": "openjdk_linux_minimal", - "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" - ] - }, - "openjdk_linux_ppc64le_vanilla": { - "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", - "name": "openjdk_linux_ppc64le_vanilla", - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "openjdk_linux_s390x_vanilla": { - "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", - "name": "openjdk_linux_s390x_vanilla", - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "openjdk_linux_vanilla": { - "downloaded_file_path": "zulu-linux-vanilla.tar.gz", - "name": "openjdk_linux_vanilla", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "openjdk_macos": { - "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", - "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" - ] - }, - "openjdk_macos_minimal": { - "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", - "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" - ] - }, - "openjdk_macos_vanilla": { - "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "openjdk_win": { - "downloaded_file_path": "zulu-win.zip", - "name": "openjdk_win", - "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" - ] - }, - "openjdk_win_minimal": { - "downloaded_file_path": "zulu-win-minimal.zip", - "name": "openjdk_win_minimal", - "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" - ] - }, - "openjdk_win_vanilla": { - "downloaded_file_path": "zulu-win-vanilla.zip", - "name": "openjdk_win_vanilla", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "platforms": { - "name": "platforms", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, - "remote_coverage_tools_for_testing": { - "name": "remote_coverage_tools_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "remote_java_tools_darwin_for_testing": { - "name": "remote_java_tools_darwin_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "remote_java_tools_javac11_test_darwin": { - "name": "remote_java_tools_javac11_test_darwin", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "remote_java_tools_javac11_test_linux": { - "name": "remote_java_tools_javac11_test_linux", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "remote_java_tools_javac11_test_windows": { - "name": "remote_java_tools_javac11_test_windows", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "remote_java_tools_linux_for_testing": { - "name": "remote_java_tools_linux_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "remote_java_tools_windows_for_testing": { - "name": "remote_java_tools_windows_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "remotejdk11_linux_aarch64_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_aarch64_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "remotejdk11_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "remotejdk11_linux_ppc64le_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_ppc64le_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_linux_s390x_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_s390x_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "remotejdk11_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "remotejdk14_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "remotejdk14_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "remotejdk14_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "rules_cc": { - "name": "rules_cc", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" - ] - }, - "rules_java": { - "name": "rules_java", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "rules_nodejs-1.3.0.tar.gz": { - "name": "rules_nodejs-1.3.0.tar.gz", - "sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz", - "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" - ] - }, - "rules_pkg": { - "name": "rules_pkg", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" - ] - }, - "rules_pkg-0.2.4.tar.gz": { - "name": "rules_pkg-0.2.4.tar.gz", - "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" - ] - }, - "rules_proto": { - "name": "rules_proto", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", - "strip_prefix": "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" - ] - }, - "upb": { - "name": "upb", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/grpc:upb_gcc10_fix.patch" - ], - "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454", - "strip_prefix": "upb-9effcbcb27f0a665f9f345030188c0b291e32482", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", - "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz" - ] - }, - "v1.26.0.tar.gz": { - "name": "v1.26.0.tar.gz", - "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", - "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz" - ] - }, - "v3.13.0.tar.gz": { - "name": "v3.13.0.tar.gz", - "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { - "name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": { - "name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": { - "name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": { - "name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - } -} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 24580faa20..ce370dd414 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -2,8 +2,6 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -# needed only for the updater -, bazel_3 , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -364,7 +362,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_3}"/bin/bazel \ + "${bazel_self}"/bin/bazel \ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ --loading_phase_threads=1 \ --output build) \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index e00e2d4b27..29874a82ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -2,8 +2,6 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -# needed only for the updater -, bazel_4 , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -326,7 +324,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_4}"/bin/bazel \ + "${bazel_self}"/bin/bazel \ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ --loading_phase_threads=1 \ --output build) \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 6f86be80f9..63d500e824 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -2,8 +2,6 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -# needed only for the updater -, bazel_4 , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -336,7 +334,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_4}"/bin/bazel \ + "${bazel_self}"/bin/bazel \ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ --loading_phase_threads=1 \ --output build) \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index cd313a5bc5..693ecce9d1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,21 +2,23 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "5.1.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "sha256-PNIqsP5p+OdYH0JgOmjqvge9zVOrAcNg0FMflXFJHwQ="; + hash = "sha256-WXzrGJaulcwg4MnyfY5jWBEVxCXryqMK+/R7J/gFI38="; }; - vendorSha256 = "sha256-9WUjQhXWkpSEJj9Xq+9rOe3I1VZ7nqMTnX7DPl+rxsU="; + vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; preBuild = '' rm -r warn/docs ''; + proxyVendor = true; + doCheck = false; excludedPackages = [ "generatetables" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 747abef1e9..4f5d440858 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -15,18 +15,18 @@ buildGoModule rec { pname = "buildah"; - version = "1.28.2"; + version = "1.29.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-1WB+lm2k7q4xViCUBhvCSuMCIlCMlAJ9etRajwGyOQs="; + hash = "sha256-g8Y4ZmQvDbzM7rG1otTxm+SRl/sK3sLM2SOWrBseOPQ="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix index 6863ef9e0f..aa67ba4393 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-sbX7IYFcU9gwKzHKC8xtmZKVE2XImeNT4RYOx+cSI2Y="; + sha256 = "sha256-50Dn04VixejYfMgXVIstuU5CgC6aB3T99nTnWP95aU0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix index d108422919..79d105128b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix @@ -1,24 +1,39 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "changie"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-hnRK9pj5NruSRvo2oetyRMVwhO7T/wSEZjcbYHb7ZUY="; + sha256 = "sha256-IZiGNmVEOJf7sqJHXCXxptfy79mSnyyyiqf+oS41MgI="; }; vendorSha256 = "sha256-0/3Ou8z6yLWhc81hdN2gkaFLLlKQWUGcIdvRHVLTrjQ="; + nativeBuildInputs = [ + installShellFiles + ]; + ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; + postInstall = '' + installShellCompletion --cmd changie \ + --bash <($out/bin/changie completion bash) \ + --fish <($out/bin/changie completion fish) \ + --zsh <($out/bin/changie completion zsh) + ''; + meta = with lib; { + description = "Automated changelog tool for preparing releases with lots of customization options"; homepage = "https://changie.dev"; changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md"; - description = "Automated changelog tool for preparing releases with lots of customization options"; license = licenses.mit; maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix b/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix index 093e015d36..dfbac9aac0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix @@ -7,17 +7,19 @@ , jsonschema , argcomplete , pytestCheckHook +, watchdog +, stdenv }: buildPythonPackage rec { pname = "clickable"; - version = "7.4.0"; + version = "7.11.0"; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - sha256 = "sha256-QS7vi0gUQbqqRYkZwD2B+zkt6DQ6AamQO7sihD8qWS0="; + sha256 = "sha256-OVS+FK2ABoKbBFLDc3drcjeaa3yO9/8Ah8FzlN2fd8g="; }; propagatedBuildInputs = [ @@ -26,18 +28,51 @@ buildPythonPackage rec { pyyaml jsonschema argcomplete + watchdog ]; nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # Test require network connection + # Tests require docker "test_cpp_plugin" "test_html" "test_python" "test_qml_only" "test_rust" - ]; + "test_review" + "test_click_build" + "test_no_device" + "test_no_file_temp" + "test_update" + "test_lib_build" + "test_clean" + "test_temp_exception" + "test_create_interactive" + "test_create_non_interactive" + "test_kill" + "test_writable_image" + "test_no_desktop_mode" + "test_no_lock" + "test_run_default_command" + "test_run" + "test_no_container_mode_log" + "test_custom_mode_log" + "test_skip_desktop_mode" + "test_log" + "test_custom_lock_file" + "test_launch_custom" + "test_launch" + "test_devices" + "test_install" + "test_skip_container_mode" + ] ++ + # There are no docker images available for the aarch64 architecutre + # which are required for tests. + lib.optionals stdenv.isAarch64 [ + "test_arch" + "test_restricted_arch" + ]; meta = { description = "A build system for Ubuntu Touch apps"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cobra-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/cobra-cli/default.nix index 989c2f161f..a3f277259f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cobra-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cobra-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, go }: buildGoModule rec { pname = "cobra-cli"; @@ -13,6 +13,22 @@ buildGoModule rec { vendorSha256 = "sha256-vrtGPQzY+NImOGaSxV+Dvch+GNPfL9XfY4lfCHTGXwY="; + nativeBuildInputs = [ makeWrapper ]; + + allowGoReference = true; + + postPatch = '' + substituteInPlace "cmd/add_test.go" \ + --replace "TestGoldenAddCmd" "SkipGoldenAddCmd" + substituteInPlace "cmd/init_test.go" \ + --replace "TestGoldenInitCmd" "SkipGoldenInitCmd" + ''; + + postFixup = '' + wrapProgram "$out/bin/cobra-cli" \ + --prefix PATH : ${go}/bin + ''; + meta = with lib; { description = "Cobra CLI tool to generate applications and commands"; homepage = "https://github.com/spf13/cobra-cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/codeowners/default.nix b/third_party/nixpkgs/pkgs/development/tools/codeowners/default.nix index 2b17f00863..186b8b4fdb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/codeowners/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/codeowners/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "codeowners"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hmarr"; repo = pname; rev = "v${version}"; - hash = "sha256-lklKZCDX/e3MZ0ix3A4AIEICPoufBq7SAIULqDXOYDI="; + hash = "sha256-bjSlt439Y5hmbxR6s4J37ao+P2tuKNuwqRg872P+MUg="; }; - vendorSha256 = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; + vendorHash = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; meta = with lib; { description = "A CLI and Go library for Github's CODEOWNERS file"; diff --git a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix index 9fd3a86f59..30d22bc183 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-d3Cg7G1rjxEqKMsIqxZ6ZZDEMIoisDtjZMmyixZRpF4="; + hash = "sha256-3rGpyJzGkZYUEvKKDzj2I5sqrUImmmX7cXWM9UClPLY="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-F9r99WhL1Uv5NNVlQYpQc282BAl8bUhJI5mZZYwyEEg="; + vendorHash = "sha256-bb9jBno7elO6qKGjacpX3rxgrpJpGpTxMQtdBYjBzMk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix index 60221444da..ac2d36c923 100644 --- a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix @@ -28,12 +28,7 @@ let patches = [ ./comby.patch ]; - nativeBuildInputs = [ - ocamlPackages.ppx_deriving - ocamlPackages.ppx_deriving_yojson - ocamlPackages.ppx_sexp_conv - ocamlPackages.ppx_sexp_message - ] ++ extraNativeInputs; + nativeBuildInputs = extraNativeInputs; buildInputs = [ ocamlPackages.core @@ -42,6 +37,10 @@ let ocamlPackages.mparser ocamlPackages.mparser-pcre ocamlPackages.angstrom + ocamlPackages.ppx_deriving + ocamlPackages.ppx_deriving_yojson + ocamlPackages.ppx_sexp_conv + ocamlPackages.ppx_sexp_message ] ++ extraBuildInputs; nativeCheckInputs = [ cacert ]; @@ -87,6 +86,9 @@ mkCombyPackage { ocamlPackages.lwt_react ocamlPackages.tar-unix ocamlPackages.tls + ocamlPackages.ppx_jane + ocamlPackages.ppx_expect + ocamlPackages.dune-configurator combyKernel combySemantic ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then @@ -97,9 +99,6 @@ mkCombyPackage { extraNativeInputs = [ autoconf pkg-config - ocamlPackages.ppx_jane - ocamlPackages.ppx_expect - ocamlPackages.dune-configurator ]; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 09c3fce04d..baa7ebf562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.16.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE="; + sha256 = "sha256-5hjAP2+0hbYcA9G7YJyRqqp1ZC8LzFDomjeFjl4z4FY="; }; - vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM="; + vendorHash = "sha256-7fC1jJMY/XK+GX5t2/o/k+EjFxAlRAmiemMcWaZhL9o="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgagroal/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgagroal/default.nix new file mode 100644 index 0000000000..e86e19f8f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgagroal/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, docutils, libev, openssl, systemd }: + +stdenv.mkDerivation rec { + pname = "pgagroal"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "agroal"; + repo = "pgagroal"; + rev = version; + hash = "sha256-d6icEYlk0qnzmoP/mvSmTw16YfIYWc2WbY7sKguX7Ug="; + }; + + patches = [ ./do-not-search-libatomic.patch ]; + + nativeBuildInputs = [ cmake docutils ]; + + buildInputs = [ libev openssl systemd ]; + + meta = with lib; { + description = "High-performance connection pool for PostgreSQL"; + homepage = "https://agroal.github.io/pgagroal/"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch b/third_party/nixpkgs/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch new file mode 100644 index 0000000000..7f65205332 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch @@ -0,0 +1,15 @@ +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -78,12 +78,6 @@ + endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- find_package(Libatomic) +- if (LIBATOMIC_FOUND) +- message(STATUS "libatomic found") +- else () +- message(FATAL_ERROR "libatomic needed") +- endif() + + find_package(Systemd) + if (SYSTEMD_FOUND) diff --git a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix index 65e6dd4b2a..0f8f5828ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bS/7S4PxZSTYvxLFmC486PBHNhkGUIPAnUJQztp3ouw="; + sha256 = "sha256-56VznyGZtSYKyjQRej1QduG/99OYObYNmplsGSckgKg="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix index 08f7cce902..0b82242fa8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.2.4"; + version = "0.3.3"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-b3vBwWya5xj/y5/32KIHtvPRT6JdMpO/IKO4sVAg4AA="; + hash = "sha256-T1laFLVDtDYOA5x3zWcBU7ae1uN1cQUqLHtY36uEXOI="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix index e9bf373451..85f19d899e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy"; + hash = "sha256-Y8ss/aw01zpgM6Z6fCGshP21kcdSOTVG/VqL8H3tlls="; }; - cargoSha256 = "0x5fd47rjmzzmwgj14gbj0rbxwbphd7f63mis4ivwlwc9ikjxdxb"; + cargoSha256 = "sha256-8o4gN6mqUU+o80IqlAYAD5qpZBSQ/FY5HoNbpwzTm0A="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix index 2f26262143..7dea51ef56 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix @@ -16,7 +16,7 @@ let pname = "dump_syms"; - version = "2.1.1"; + version = "2.2.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-XK//loEbKqE7DMxC9uzr+916i9E9wGHKl2MRtt1rNEg="; + hash = "sha256-rbpZXLtBPD77jZ+P6ljtrSfKYfhMUdsP/Eoi0cYxsqo="; }; - cargoSha256 = "sha256-2We/JKU1U5q5jzl9rVoDmuGYIPbo5ylMl2O4s3PClVE="; + cargoSha256 = "sha256-UUyoiyA9ykUnFavsAqo7gNMSYpQ9Lu29t4fn1oLj6gs="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix index 2145a3ab74..3a66004bc3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-OAdKt5RgLVoTmccN50TUwUAU7VLiTU9hEnDAKxKBRzI="; + sha256 = "sha256-tMlHhfPocm+n2aHG/XXbhElwPau8IHxEm6IrYaszcNQ="; }; - vendorSha256 = "sha256-Y9wfeAX0jt3KrpRa5kJi8V8WN/hp4jTcPCbvy0RDGRk="; + vendorSha256 = "sha256-kfJfEvMHaPyDK9qkZVP07NByALxVwPcAKs9Kab6v4NE="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/frink/default.nix b/third_party/nixpkgs/pkgs/development/tools/frink/default.nix new file mode 100644 index 0000000000..803fb63c5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/frink/default.nix @@ -0,0 +1,54 @@ +{ fetchurl +, frink +, jdk +, lib +, rlwrap +, stdenv +, testers +}: +stdenv.mkDerivation rec { + pname = "frink"; + version = "2023-01-31"; + + src = fetchurl { + # Upstream does not provide versioned download links + url = "https://web.archive.org/web/20230202134810/https://frinklang.org/frinkjar/frink.jar"; + sha256 = "sha256-xs1FQvFPgeAxscAiwBBP8N8aYe0OlsYbH/vbzzCbYZc="; + }; + + dontUnpack = true; + + buildInputs = [ jdk rlwrap ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib + + cp ${src} $out/lib/frink.jar + + cat > "$out/bin/frink" << EOF + #!${stdenv.shell} + exec ${rlwrap}/bin/rlwrap ${jdk}/bin/java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter "\$@" + EOF + + chmod a+x "$out/bin/frink" + + runHook postInstall + ''; + + meta = with lib; { + description = "A practical calculating tool and programming language"; + homepage = "https://frinklang.org/"; + license = licenses.unfree; + sourceProvenance = [ sourceTypes.binaryBytecode ]; + maintainers = [ maintainers.stefanfehrenbach ]; + }; + + passthru.tests = { + callFrinkVersion = testers.testVersion { + package = frink; + command = "frink -e 'FrinkVersion[]'"; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix index 1171700ff9..230c38ed44 100644 --- a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.32.0"; + version = "0.32.1"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA="; + sha256 = "sha256-ts2OGRdz1ajJ36XXUC48Jkygr3LDdZfHJ88peJkjqbg="; }; - cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU="; + cargoHash = "sha256-b54/65xYZ9a04dPm90R9tzhdjTwTaXvi4NnQe9k+qvE="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-jet/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-jet/default.nix new file mode 100644 index 0000000000..4ce214ee41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/go-jet/default.nix @@ -0,0 +1,53 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-jet"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "jet"; + rev = "v${version}"; + sha256 = "sha256-1kJaBLZIunexjxjOy55Nw0WMEhrSu+ptMbWVOJ1e5iA="; + }; + + vendorSha256 = "sha256-mhH9P3waINZhP+jNg3zKlssIL1ZO5xOBHp19Bzq/pSQ="; + + subPackages = [ "cmd/jet" ]; + + tags = [ + "mysql" + "golang" + "postgres" + "sql" + "database" + "code-generator" + "sqlite" + "postgresql" + "mariadb" + "sql-query" + "codegenerator" + "typesafe" + "sql-builder" + "datamapper" + "code-completion" + "sql-queries" + "cockroachdb" + "sql-query-builder" + "sqlbuilder" + "typesafety" + ]; + + postPatch = '' + # removing the tests which depend on external data + rm -rf tests/{sqlite,postgres,mysql} + ''; + + meta = with lib; { + homepage = "https://github.com/go-jet/jet"; + description = "Type safe SQL builder with code generation and automatic query result data mapping"; + maintainers = with maintainers; [ mrityunjaygr8 ]; + license = licenses.asl20; + mainProgram = "jet"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 9a8f205295..5be71b1fd5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.16.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-fd+ZR74tApbZEXfMqpUAMk22h9rMRmtByGSd8JcTtK0="; + sha256 = "sha256-Iut45RobHc3KZ0vzOqmQT0F8A/GSP5KCfprnmB3zFAA="; }; preCheck = '' @@ -22,7 +22,7 @@ buildGoModule rec { CGO_ENABLED = false; - vendorSha256 = "sha256-SRTxe3y+wQgxsj7ruquMG16dUEAa92rnTXceysWm+F8="; + vendorHash = "sha256-Dl8Q6fQa7BKp06a4OT82+wHYQRN1aWZ2qK25GzhOw8A="; meta = with lib; { homepage = "https://github.com/vektra/mockery"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix index 3890133256..5077bc45b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2022.1.2"; + version = "2023.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-pfZv/GZxb7weD+JFGCOknhRCsx8g5puQfpY9lZ4v6Rs="; + sha256 = "sha256-RzYaaiDu78JVM8G0zJzlZcyCd+1V9KZIyIIyVib0yZc="; }; - vendorSha256 = "sha256-19uLCtKuuZoVwC4SUKvYGWi2ryqAQbcKXY1iNjIqyn8="; + vendorHash = "sha256-o9UtS6AMgRYuAkOWdktG2Kr3QDBDQTOGSlya69K2br8="; excludedPackages = [ "website" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index ccd230cc5f..f3a54a83a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.51.0"; + version = "1.51.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-mmnzbgnu/S9DhFY5JQSs8U5tvsGqIcDaX5Y7dhCgr68="; + hash = "sha256-BkkC23dO40gnEQ6sJcbLR2UzdigMrta2+NnZA2bk3E8="; }; - vendorHash = "sha256-QoUxZBl0wOpbD2xPCQAeTNiLxdtXZ3+KWB/TLSt53v4="; + vendorHash = "sha256-CS9Z3nvOleKTYjw89IKybsUI33w0If/mYDUpQHLO58U="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/initool/default.nix b/third_party/nixpkgs/pkgs/development/tools/initool/default.nix new file mode 100644 index 0000000000..ce8f769ae4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/initool/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, mlton +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "initool"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "dbohdan"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pszlP9gy1zjQjNNr0L1NY0XViejUUuvUZH6JHtUxdJI="; + }; + + nativeBuildInputs = [ mlton ]; + + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp initool $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + inherit (mlton.meta) platforms; + + description = "Manipulate INI files from the command line"; + homepage = "https://github.com/dbohdan/initool"; + license = licenses.mit; + maintainers = with maintainers; [ e1mo ]; + changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix index b4c682bbd2..0686d4fb2e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { prePatch = "cd test"; - buildInputs = [ ocaml findlib sawja ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ sawja ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix b/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix index d18b32c6f4..750e93f665 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZEXW9nqkR0yuVIY9qr1RyKVE7tSlP59Xb4JZfdAK2To="; + sha256 = "sha256-rz3cAA5iqhrCZhLc+RKZhudiMlfu3m6wWYNHAnUP/kg="; }; - vendorHash = "sha256-e7SJjDWcHPgupZujeRD3Zg6vFAudDC3V60R2B61fjGU="; + vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA="; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix index 57723da45e..0ddbf8f5d5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mtAP8qRfSdt2koKs6LSI9iiXsyK92q1yWOC9zV8utFg="; + sha256 = "sha256-F+cGJbxXIHrgn9OcIMh2am9g4PBLkdC037tV/9znPSg="; }; patches = [ ./version.patch ]; - vendorSha256 = "sha256-9IGdsAqvi01Jf0FpxfL+O+LrDchh4dGgJX4JJIvL3vE="; + vendorHash = "sha256-nZyDoME5fVqRoAeLADjrQ7i6mVf3ujGN2+BUfrSHck8="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix index 4d363d4e75..f58b3de977 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-foY1fcIn+jywABwEVBWctx4zwLg7k2zxkpL8UAhx6kA="; + sha256 = "sha256-c4+ebl/tWPxAlgt/N5/xalZQZGSizKp/pDcgojbjy7A="; }; - cargoHash = "sha256-WHaORWwR7PeKacaCtXjTYMTCyZ4ZFWo1smVx5ig+Z9U="; + cargoHash = "sha256-D3RjlYMD/UHfYxUMvZVSiRHOPmcLVGgsRVghoaMn9AM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix rename to third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index 24b360a781..d260e7601e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -1,16 +1,14 @@ { lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }: -let - target = if stdenv.isDarwin then "macOS" else "Linux"; -in + stdenv.mkDerivation rec { - pname = "sumneko-lua-language-server"; - version = "3.6.7"; + pname = "lua-language-server"; + version = "3.6.10"; src = fetchFromGitHub { - owner = "sumneko"; + owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-x7/yO1rJ+VBG4EFpISYblRECLW2lsLz5wcqLR14UV/g="; + sha256 = "sha256-QnkWEf1Uv+CZwEyv1b3WMPvaOZEn+mKH5w3CPyw02CQ="; fetchSubmodules = true; }; @@ -24,12 +22,13 @@ stdenv.mkDerivation rec { Foundation ]; - preBuild = '' - cd 3rd/luamake - '' - + lib.optionalString stdenv.isDarwin '' - # Needed for the test - export HOME=/var/empty + postPatch = '' + # filewatch tests are failing on darwin + # this feature is not used in lua-language-server + sed -i /filewatch/d 3rd/bee.lua/test/test.lua + + pushd 3rd/luamake + '' + lib.optionalString stdenv.isDarwin '' # This package uses the program clang for C and C++ files. The language # is selected via the command line argument -std, but this do not work # in combination with the nixpkgs clang wrapper. Therefor we have to @@ -44,11 +43,11 @@ stdenv.mkDerivation rec { ''; ninjaFlags = [ - "-fcompile/ninja/${lib.toLower target}.ninja" + "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; postBuild = '' - cd ../.. + popd ./3rd/luamake/luamake rebuild ''; @@ -66,18 +65,20 @@ stdenv.mkDerivation rec { makeWrapper "$out"/share/lua-language-server/bin/lua-language-server \ $out/bin/lua-language-server \ --add-flags "-E $out/share/lua-language-server/main.lua \ - --logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/sumneko_lua/log \ - --metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/sumneko_lua/meta" + --logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/log \ + --metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/meta" runHook postInstall ''; + # some tests require local networking + __darwinAllowLocalNetworking = true; + meta = with lib; { - description = "Lua Language Server coded by Lua"; - homepage = "https://github.com/sumneko/lua-language-server"; + description = "A language server that offers Lua language support"; + homepage = "https://github.com/luals/lua-language-server"; license = licenses.mit; - maintainers = with maintainers; [ sei40kr ]; + maintainers = with maintainers; [ figsoda sei40kr ]; platforms = platforms.linux ++ platforms.darwin; - mainProgram = "lua-language-server"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 036c5057d8..66488a607f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs="; + hash = "sha256-1GoZbeXNG00oxBdPa2yk0aOCVguwIkK6fKrlHU6mZYc="; }; - cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ="; + cargoHash = "sha256-arIFWJX8WQQWcJP1YpMwFy2XHU/0w+oPj1qE/IlYRF4="; postPatch = '' rm .cargo/config.toml diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix index 22f1e98f18..ee26e81e88 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix @@ -2,24 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-01-01"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-xpNlmGG7Qy0SPzXZ9sQ0i9Yo2hMaK+YsTEOTk10rs+k="; + hash = "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ="; }; - cargoHash = "sha256-mwfM3hIEaHKa2oPVWzXpua+W2Oa5brvNRbRCcV0KapY="; + cargoHash = "sha256-k4hw+kH447uqsCASuaZxRx2xmMkmn9LM5sHYL2AJN9k="; - CFG_DATE = version; - CFG_REV = "release"; + CFG_RELEASE = version; nativeBuildInputs = [ (lib.getBin nix) ]; + # might be related to https://github.com/NixOS/nix/issues/5884 + preBuild = '' + export NIX_STATE_DIR=$(mktemp -d) + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix index d39b91180f..91ac7b7bce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix @@ -13,18 +13,21 @@ let in buildBazelPackage rec { pname = "verible"; - version = "0.0-2472-ga80124e1"; # These environment variables are read in bazel/build-version.py to create - # a build string. Otherwise it would attempt to extract it from .git/. - GIT_DATE = "2022-10-21"; - GIT_VERSION = version; + # a build string shown in the tools --version output. + # If env variables not set, it would attempt to extract it from .git/. + GIT_DATE = "2023-02-02"; + GIT_VERSION = "v0.0-2821-gb2180bfa"; + + # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" + version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); src = fetchFromGitHub { owner = "chipsalliance"; repo = "verible"; - rev = "v${version}"; - sha256 = "sha256:0jpdxqhnawrl80pbc8544pyggdp5s3cbc7byc423d5v0sri2f96v"; + rev = "${GIT_VERSION}"; + sha256 = "sha256-etcimvInhebH2zRPyZnWUq6m3VnCq44w32GJrIacULo="; }; patches = [ @@ -46,8 +49,8 @@ buildBazelPackage rec { # of the output derivation ? Is there a more robust way to do this ? # (Hashes extracted from the ofborg build logs) sha256 = { - aarch64-linux = "sha256-6Udp7sZKGU8gcy6+5WPhkSWunf1sVkha8l5S1UQsC04="; - x86_64-linux = "sha256-WfhgbJFaM/ipdd1dRjPeVZ1mK2hotb0wLmKjO7e+BO4="; + aarch64-linux = "sha256-dYJoae3+u+gpULHS8nteFzzL974cVJ+cJzeG/Dz2HaQ="; + x86_64-linux = "sha256-Jd99+nhqgZ2Gwd78eyXfnSSfbl8C3hoWkiUnzJG1jqM="; }.${system} or (throw "No hash for system: ${system}"); }; @@ -62,12 +65,9 @@ buildBazelPackage rec { bazel/build-version.py \ bazel/sh_test_with_runfiles_lib.sh \ common/lsp/dummy-ls_test.sh \ - common/parser/move_yacc_stack_symbols.sh \ - common/parser/record_syntax_error.sh \ common/tools/patch_tool_test.sh \ common/tools/verible-transform-interactive.sh \ common/tools/verible-transform-interactive-test.sh \ - common/util/create_version_header.sh \ kythe-browse.sh \ verilog/tools ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch b/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch index 19d20309c1..57b152d9db 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch @@ -1,5 +1,5 @@ diff --git a/WORKSPACE b/WORKSPACE -index 696cc7ef..55a5bb8a 100644 +index ad16b3a1..52b66703 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup") @@ -12,11 +12,11 @@ index 696cc7ef..55a5bb8a 100644 - -win_flex_configure( - name = "win_flex_bison", -- sha256 = "095cf65cb3f12ee5888022f93109acbe6264e5f18f6ffce0bda77feb31b65bd8", -- # bison 3.3.2, flex 2.6.4 -- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.18/win_flex_bison-2.5.18.zip", +- sha256 = "8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135", +- # bison 3.8.2, flex 2.6.4 +- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip", -) - http_archive( name = "rules_m4", - sha256 = "c67fa9891bb19e9e6c1050003ba648d35383b8cb3c9572f397ad24040fb7f0eb", + sha256 = "b0309baacfd1b736ed82dc2bb27b0ec38455a31a3d5d20f8d05e831ebeef1a8e", diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 57c405a7f7..4e60fffbeb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0emAo/K27lmQ+409maTR/hnonQVkbijF0RAwvIErBFo="; + sha256 = "sha256-A6aFHC4MNNFl7IieR/7aQ3cMzhBXfQwq6sPv+v5Gu4o="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 1c6fa49d7c..a8fd24ebd6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.41"; + version = "0.2.42"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nfMLw3fjEex1XV+Vhi84xR+ghBLrmKDtuFIIeNhP/yQ="; + hash = "sha256-+1ciEHBMl78aFDu/NzIAdsGtAZJOfHZRDDZCR1+YuEM="; }; vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 6fcdb5b753..b657a9ded9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23272"; + version = "0.1.23334"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yj7bIVVCG2q6Q2ij+rH3AAC4xW7Drz+pmdIM2ToPJX4="; + sha256 = "sha256-1+PcjameB9/1MoyM0RAxrhuE649INyLlhgxA5xJQ9Pw="; }; - vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; + vendorHash = "sha256-E24b8PUA1Hy+OepQe2n6TecCMKKicdr5KUdiJ663Td0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix index f941ab05e2..ae880ceb8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix @@ -5,13 +5,15 @@ , shortenPerlShebang , mysqlSupport ? false , postgresqlSupport ? false +, templateToolkitSupport ? false }: let sqitch = perlPackages.AppSqitch; modules = with perlPackages; [ ] ++ lib.optional mysqlSupport DBDmysql - ++ lib.optional postgresqlSupport DBDPg; + ++ lib.optional postgresqlSupport DBDPg + ++ lib.optional templateToolkitSupport TemplateToolkit; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index 471932ff83..dd25dd864c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ which ocaml ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ which ocaml ocamlbuild ]; # build fails otherwise enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index 65debca11c..9d81c46e20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml perl ]; prefixKey = "-prefix "; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix index 753ef0a836..87db3baf0b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix @@ -52,7 +52,9 @@ stdenv.mkDerivation { sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; inherit meta; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix index 7e48203c09..7bc1f80c69 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix @@ -20,10 +20,11 @@ in buildDunePackage rec { sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core rresult logs odoc bos yojson astring fpath ]; - nativeCheckInputs = [ alcotest ] ++ runtimeInputs; + nativeCheckInputs = [ odoc ]; + checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index cec91a02f2..de8906dba4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage -, cmdliner, yojson, ppxlib +, cmdliner, yojson, ppxlib, findlib , menhir, menhirLib }: @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; version = "4.1.0"; duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; @@ -17,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ppxlib ]; configurePlatforms = []; - propagatedBuildInputs = [ menhirLib yojson ]; + propagatedBuildInputs = [ menhirLib yojson findlib ]; meta = { description = "Compiler from OCaml bytecode to Javascript"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix index 8a4dce3422..4a0a87577c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-dqWP9rwWmr7i3O29v/kipJL01B3qQozaToOFCdfTWZU="; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; buildPhase = '' patchShebangs ./bootstrap diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix index f5853057d8..095af77691 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -11,7 +11,8 @@ with ocamlPackages; buildDunePackage rec { sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ="; }; - buildInputs = [ ncurses ocp-build lablgtk3-sourceview3 ocp-index ]; + nativeBuildInputs = [ ocp-build ]; + buildInputs = [ ncurses lablgtk3-sourceview3 ocp-index ]; configurePhase = '' export TERM=xterm diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix index b40c8b4254..0ac69f86c9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = '' substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"' diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 551a36adae..5b4f7e8e44 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = !doCheck; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out" + lib.optionalString doCheck " --enable-tests"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix index 48b7d840a4..8277f4adb0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql"; }; - propagatedBuildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; patches = [ ./Makefile.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index feb787d24d..de26536eb1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ ocaml findlib cmdliner_1_0 re ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ cmdliner_1_0 re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 54e1ee55a7..fcb4393811 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; version = "3.7.0"; - buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = with ocamlPackages; [ ppx_tools ]; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix index f6c7955c68..b7d670ce4a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q="; }; - buildInputs = [ ocaml ncurses ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; + buildInputs = [ ncurses ]; meta = { description = "A build system designed for scalability and portability"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix index 60804684cc..23a73002e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,8 +47,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip curl ocaml ]; + buildInputs = [ ncurses ]; src = srcs.opam; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index de831fde99..1db7ea151f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -79,8 +79,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.1.4"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 8929afdef0..8b573039d7 100755 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -68,8 +68,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index 5d500339ff..0afaff2649 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -11,7 +11,7 @@ let version = "2.10.0"; sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA="; duneVersion = "3"; - propagatedBuildInputs = [ lambda-term zed logs ]; + propagatedBuildInputs = [ findlib lambda-term zed logs ]; } else { diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index b4843ddc10..8ce09c8e39 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "13.8.0"; + version = "14.2.4"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mplWF/lmgRfYd1Gg2loZI5NIfmTHR8quG1/KcZj5W54="; + hash = "sha256-4o0Z3xXsVTr2dE5td/i2uQoaqsBGOMSrzt2X6C9gYbA="; }; - vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; + vendorHash = "sha256-ehG71B351u+LoXDuKQkuEdEpUdHslVU2HcPKUz6FAnQ="; sourceRoot = "source/src"; @@ -35,6 +35,11 @@ buildGoModule rec { "static_build" ]; + postPatch = '' + # this test requires internet access + rm engine/migrate_glyphs_test.go + ''; + postInstall = '' mv $out/bin/{src,oh-my-posh} mkdir -p $out/share/oh-my-posh diff --git a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix index 469c68e204..7a50b2df24 100644 --- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-Eprsy/wd5lMBXk3yVGhofYD9ZBfdmjGMwXZ61RMgd4k="; + hash = "sha256-0pnPffvKcBpBir0l6rpp7iVbF9XlMTCG2mifzYkEQ7s="; }; vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 3b38cc97e6..fd8658ad07 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hIJTdTZ24+VwF1M/RvKcnQRzZga0nsjlTTUFYxZn0lo="; + hash = "sha256-rvLWM6G2kOOuFU0JuwdIjSCFNyjBNL+fOoEj+tIR190="; }; - vendorHash = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM="; + vendorHash = "sha256-L+Z1k+z/XNO9OeTQVzNJd1caRip6Ti8mPfNmXJx5D5c="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix new file mode 100644 index 0000000000..f379a1ed05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, python3 +, bison +, flex +, zlib +}: + +stdenv.mkDerivation rec { + pname = "spicy"; + version = "1.5.3"; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "spicy"; + rev = "v${version}"; + hash = "sha256-eCF914QEBBqg3LfM3N22c7W0TMOhuHqLxncpAG+8FjU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + python3 + ]; + + buildInputs = [ + bison + flex + zlib + ]; + + postPatch = '' + patchShebangs scripts tests/scripts + ''; + + cmakeFlags = [ + "-DHILTI_DEV_PRECOMPILE_HEADERS=OFF" + ]; + + preFixup = '' + for b in $out/bin/* + do wrapProgram "$b" --prefix PATH : "${lib.makeBinPath [ bison flex ]}" + done + ''; + + meta = with lib; { + homepage = "https://github.com/zeek/spicy"; + description = "A C++ parser generator for dissecting protocols & files"; + longDescription = '' + Spicy is a parser generator that makes it easy to create robust C++ + parsers for network protocols, file formats, and more. Spicy is a bit + like a "yacc for protocols", but it's much more than that: It's an + all-in-one system enabling developers to write attributed grammars that + describe both syntax and semantics of an input format using a single, + unified language. Think of Spicy as a domain-specific scripting language + for all your parsing needs. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index 9e792a4973..9704788141 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "sha256-z90V4aKp5gIZMWQha3gHpTMtpYVsGhFtPWHiJuFt3qA="; + hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w="; }; outputs = [ "out" ]; @@ -40,5 +40,6 @@ perlPackages.buildPerlPackage rec { changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; maintainers = [ maintainers.marsam ]; license = [ licenses.postgresql licenses.artistic2 ]; + mainProgram = "pg_format"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix index 2d19f0fca3..e347f4c48e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.11.25"; + version = "2023.2.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ElnWxwU7EIbZqqvIGp/rc5vS0X6BuyAgSJoy7BQYYu4="; + sha256 = "sha256-GKPrpRnjbVnw1af5xCvSaFIeS5t7PRvWrc8TFWkyMnU="; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix index 335b5cd17b..ffe1eaf6a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix @@ -4,6 +4,7 @@ , cmake , cpm-cmake , git +, git2-cpp , cacert , boost179 , fmt_8 @@ -11,19 +12,14 @@ , libarchive , libgit2 , lz4 +, mitama-cpp-result , ninja , openssl_3 +, package-project-cmake , spdlog }: let - git2Cpp = fetchFromGitHub { - owner = "ken-matsui"; - repo = "git2-cpp"; - rev = "v0.1.0-alpha.1"; - sha256 = "sha256-Ub0wrBK5oMfWGv+kpq/W1PN3yzpcfg+XWRFF/lV9VCY="; - }; - glob = fetchFromGitHub { owner = "p-ranav"; repo = "glob"; @@ -31,20 +27,6 @@ let sha256 = "sha256-2y+a7YFBiYX8wbwCCWw1Cm+SFoXGB3ZxLPi/QdZhcdw="; }; - packageProjectCMake = fetchFromGitHub { - owner = "TheLartians"; - repo = "PackageProject.cmake"; - rev = "v1.3"; - sha256 = "sha256-ZktftDrPo+JhBt0XKJekv0cyxIagvcgMcXZOBd4RtKs="; - }; - - mitamaCppResult = fetchFromGitHub { - owner = "LoliGothick"; - repo = "mitama-cpp-result"; - rev = "v9.3.0"; - sha256 = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM="; - }; - structopt = fetchFromGitHub { owner = "p-ranav"; repo = "structopt"; @@ -61,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "poac"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "poacpm"; repo = pname; rev = version; - sha256 = "sha256-jXYPeI/rVuTr7OYV5sMgNr+U1OfN0XZtun6mihtlErY="; + sha256 = "sha256-JgGa7lomDvZG5HLxGJMALcezjnZprexJDTxyTUjLetg="; }; preConfigure = '' @@ -76,13 +58,13 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCPM_USE_LOCAL_PACKAGES=ON" + "-DPOAC_BUILD_TESTING=OFF" "-DCPM_SOURCE_CACHE=${placeholder "out"}/share" "-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_8}" - "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2Cpp}" + "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2-cpp.src}" "-DFETCHCONTENT_SOURCE_DIR_GLOB=${glob}" - "-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${packageProjectCMake}" - "-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitamaCppResult}" + "-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${package-project-cmake.src}" + "-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitama-cpp-result.src}" "-DFETCHCONTENT_SOURCE_DIR_NINJA=${ninja.src}" "-DFETCHCONTENT_SOURCE_DIR_STRUCTOPT=${structopt}" "-DFETCHCONTENT_SOURCE_DIR_TOML11=${toml11}" @@ -95,10 +77,10 @@ stdenv.mkDerivation rec { enableStatic = !stdenv.isDarwin; }) fmt_8 - git2Cpp + git2-cpp glob - packageProjectCMake - mitamaCppResult + package-project-cmake + mitama-cpp-result ninja structopt toml11 diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index 6c6e88fc15..42eec2fa4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.128.0"; + version = "0.129.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-2EIaK7UyJH9YEKlOGnnKrq3ucVgEjbF2jVui0bASNcA="; + sha256 = "sha256-GdJyOZ0FqLBRGeQZ5+qLYXLL8JxqigYCVuDUUs1KbN4="; }; - vendorHash = "sha256-uQ8/cNNFelG8zzrcEs9fEs8KkY6/odwOGmwMmyxUKS4="; + vendorHash = "sha256-iXT+xvmVDfFVV/bYq+hnmkz2ODUQ4fHR8z2lcaK93TE="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix index 948115c332..e65ae273b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.41"; + version = "0.0.42"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-6QBE6+wJ9MQXey9nXaJn69uVUhIVlWMdH9ROiMi7bZk="; + sha256 = "sha256-fs+etB/tzqzV3QbQKa4xqsAjtUkr1BdKtTNvRylnKaY="; }; vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix index e9bcb2efae..cc6212a524 100644 --- a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3, runCommand, darwin }: rustPlatform.buildRustPackage rec { pname = "py-spy"; @@ -11,6 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; }; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Pull a header that contains a definition of proc_pid_rusage(). + (runCommand "${pname}_headers" { } '' + install -Dm444 ${lib.getDev darwin.apple_sdk.sdk}/include/libproc.h $out/include/libproc.h + '') + ]; + NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; # error: linker `arm-linux-gnueabihf-gcc` not found diff --git a/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix index 3858394ce3..d568743ec6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-owFNk+UMKBkrad45zcSHTUidmRVIIGRZ06Ll84ZfEfA="; + sha256 = "sha256-0+9fxNj0TZUQwOh9kww00/k/J8ciuWfYQS4e1aCcd7Y="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix index f8319fe6c2..541ce48bdc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.239"; + version = "0.0.244"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ogAy1HrkoG7PWvDd4HlqTVNjrWpyWw2B+E9DANCoJNo="; + sha256 = "sha256-oQBNVs7hoiXNqz5lYq5YNKHfpQ/c8LZAvNvtFqpTM2E="; }; - cargoSha256 = "sha256-C5ZOV2EUiV4W3J3jXS+aDyL3w+Rjx1YGTaE8ikqB2VQ="; + cargoSha256 = "sha256-61kypAXWfUZLfTbSp+b0gCKwuWtxAYVtKIwfVOcJ2o8="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix index cf540117f5..b69c7968dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.20.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-tzC5AOlms5UDQ8+L7M2Tb5K/RtjZuDs23JSnLGH6pkI="; + sha256 = "sha256-h0jRuY3GSqK85NCeFqdqjyVdNTMbdtD70zU5G3w1STc="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-9r/RPzjPzDSRamntfu8Xz4XWieAU/bnw2m9wtzwkcwk="; + cargoHash = "sha256-GC2ggTJJV3Aww3qPfsnuND0eII1l3OBoZfi5RtvhO8I="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix new file mode 100644 index 0000000000..03117e9c1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-ndk"; + version = "2.12.6"; + + src = fetchFromGitHub { + owner = "bbqsrc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-VGdFIMyZhb7SDWAXgs7kFlblYCO4rLf+3/N7Mashc4o="; + }; + + cargoHash = "sha256-pv6t9oKj5tdQjpvBgj/Y11uKJIaIWcaA9ib/Id/s+qs="; + + meta = with lib; { + description = "Cargo extension for building Android NDK projects"; + homepage = "https://github.com/bbqsrc/cargo-ndk"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ mglolenstine ]; + platforms = platforms.linux; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/devserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/devserver/default.nix deleted file mode 100644 index 305a01b699..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/devserver/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, openssl -, pkg-config -, CoreServices -}: - -rustPlatform.buildRustPackage rec { - pname = "devserver"; - version = "0.4.0"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices; - - cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; - - meta = with lib; { - description = "An extremely tiny tool to serve a static folder locally"; - homepage = "https://github.com/kettle11/devserver"; - license = licenses.zlib; - maintainers = with maintainers; [ nickhu ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix index 6dd1d5e32b..a86867eded 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.6"; + version = "1.0.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; + sha256 = "sha256-nHAsKvNEhGDVrLx8K7xnm7TuCxaZcYwlQ6xjVRvDdSk="; }; - cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; + cargoSha256 = "sha256-ydZ0KM/g9k0ux7Zr4crlxnKCC9N/qPzn1wmzbTIyz7o="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index a90ac2780e..80fbfe249d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-01-23"; - cargoSha256 = "sha256-NSdHvWN5BIEXZMFiweKYbJayxDqlFmqJp+sIzeORhSU="; + version = "2023-01-30"; + cargoSha256 = "sha256-ONziMXbMPDoIb44mOJCg5O1QOo5o13kaGb+b6Qp3Ikk="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; + sha256 = "sha256-W8abw+8SuxSMMBH4ydfawdC6zwPHQwhHerFEXkB4oU4="; }; auditable = true; # TODO: remove when this is the default diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 0bab699b3c..f4fac66446 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-08H/aNYUsTORCwTm9pwWiLQjAcWSiZrjg5q6OkkllWg="; + sha256 = "sha256-HkaCaOVbEEy8H6gN9hoiDEEQM+XWyUJ4gYPxTlbBGgA="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-GEZZXRPfpIhr73SpyP9iLSjRe67wllSpp5oh6N0S9ok="; + cargoHash = "sha256-4RUeUwixb5omcHT4jJHJKF2lYZE/4014DnrR2j7sen0="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index f512e48e91..4e1a51f515 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "skaffold"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-TFI715knhQ3QyWF1EwIxZfZQW16uDWAqa6LVNfqC8Ws="; + sha256 = "sha256-D0KcnxfjPBGHLGs5YLdecuKL07jIhF6w/SIr/I/W1rI="; }; vendorSha256 = "sha256-yy1BVorjLEcZR6PqupBiZx2plwPJ6xlxripbyB6RLek="; subPackages = ["cmd/skaffold"]; - ldflags = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in [ + ldflags = let t = "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold"; in [ "-s" "-w" "-X ${t}/version.version=v${version}" "-X ${t}/version.gitCommit=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix b/third_party/nixpkgs/pkgs/development/tools/statik/default.nix index 6befb42c24..977b086027 100644 --- a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/statik/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; }; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; # Avoid building example subPackages = [ "." "fs" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/swc/default.nix b/third_party/nixpkgs/pkgs/development/tools/swc/default.nix new file mode 100644 index 0000000000..c68542978d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/swc/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "swc"; + version = "0.91.19"; + + src = fetchCrate { + pname = "swc_cli"; + inherit version; + sha256 = "sha256-BzReetAOKSGzHhITXpm+J2Rz8d9Hq2HUagQmfst74Ag="; + }; + + cargoSha256 = "sha256-1U9YLrPYENv9iJobCxtgnQakJLDctWQwnDUtpLG3PGc="; + + buildFeatures = [ "swc_core/plugin_transform_host_native" ]; + + meta = with lib; { + description = "Rust-based platform for the Web"; + homepage = "https://github.com/swc-project/swc"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 87ec2964a0..eb5c0a6258 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.9"; + version = "1.13.10"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-dAe19D9q5JXeWCnsfbz0NnAtnAQj0dyIy6cdyjqVxEg="; + hash = "sha256-+TNKHyLqW/R/YEpynr4twvQpgeOxbyIlgQjaQarSB8M="; }; - cargoHash = "sha256-gc3tDTsmgvMfLbWh5XALEpZuK6e8FXsomfq4U/xTPXM="; + cargoHash = "sha256-7D9oyQK9VWOSAI9jSYZn7t8ll4sILpugroLWlST4Eok="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix index 6f5d9162c5..077042b1c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix @@ -5,9 +5,15 @@ , cmake , gtest , spdlog +, libxml2 +, libffi +, Foundation }: -llvmPackages.stdenv.mkDerivation rec { +let + stdenv = llvmPackages.stdenv; +in +stdenv.mkDerivation rec { pname = "wasmedge"; version = "0.11.2"; @@ -18,19 +24,26 @@ llvmPackages.stdenv.mkDerivation rec { sha256 = "sha256-P2Y2WK6G8aEK1Q4hjrS9X+2WbOfy4brclB/+SWP5LTM="; }; + nativeBuildInputs = [ + cmake + llvmPackages.lld + ]; + buildInputs = [ boost spdlog llvmPackages.llvm + libxml2 + libffi + ] ++ lib.optionals stdenv.isDarwin [ + Foundation ]; - nativeBuildInputs = [ cmake llvmPackages.lld ]; - - nativeCheckInputs = [ gtest ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git + ] ++ lib.optionals stdenv.isDarwin [ + "-DWASMEDGE_FORCE_DISABLE_LTO=ON" ]; meta = with lib; { @@ -38,5 +51,7 @@ llvmPackages.stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications"; maintainers = with maintainers; [ dit7ya ]; + # error: no member named 'utimensat' in the global namespace + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix index f79c96f545..5f84e1e01f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, rustPlatform, fetchCrate }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, testers +, wizer +}: rustPlatform.buildRustPackage rec { pname = "wizer"; - version = "1.4.0"; + version = "1.6.0"; - src = fetchCrate { - inherit pname version; - - sha256 = "sha256-3Hc3KKqtbZtvD+3lb/W7+AyrwPukJyxpUe94KGQlzBI="; + # the crate does not contain files which are necessary for the tests + # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04 + src = fetchFromGitHub { + owner = "bytecodealliance"; + repo = "wizer"; + # see https://github.com/bytecodealliance/wizer/pull/62 + rev = "e74c6e59562c4b7edcda506674db8aead878a893"; + sha256 = "sha256-bVxjcb231Ygz+z+8D1U2YQqEdIKsostxISgYt2KecXc="; }; - cargoSha256 = "sha256-zv36/W7dNpIupYn8TS+NaF7uX+BVjrI6AW6Hrlqr8Xg="; + cargoSha256 = "sha256-S9h47aGG5UhwNoOnUHFrtEyByg8iCMC88Cspb/6tb8c="; cargoBuildFlags = [ "--bin" pname ]; @@ -22,11 +32,14 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; + passthru.tests = { + version = testers.testVersion { package = wizer; }; + }; + meta = with lib; { description = "The WebAssembly pre-initializer"; homepage = "https://github.com/bytecodealliance/wizer"; license = licenses.asl20; - maintainers = with maintainers; [ lucperkins ]; - broken = stdenv.isx86_64 && stdenv.isDarwin; + maintainers = with maintainers; [ lucperkins amesgen ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix new file mode 100644 index 0000000000..0d05ef2577 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "yamlfmt"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-oTdBFWISOfaz4ZDbJmyxtaKrjo9DVNJ5N7Qxnu7SwZA="; + }; + + vendorSha256 = "sha256-QRY6mYtrMvjUqXJOOvHL0b0OQ28320UwV8HL4fXpcNQ="; + + doCheck = false; + + meta = with lib; { + description = "An extensible command line tool or library to format yaml files."; + homepage = "https://github.com/google/yamlfmt"; + license = licenses.asl20; + maintainers = with maintainers; [ sno2wman ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 3af3e43fe2..6098c50df1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -5,7 +5,7 @@ }@inputs: let - inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; + inherit (pkgs) stdenv lib callPackage git rsync runCommandLocal; compose = f: g: x: f (g x); id = x: x; diff --git a/third_party/nixpkgs/pkgs/development/tools/yj/default.nix b/third_party/nixpkgs/pkgs/development/tools/yj/default.nix index 017434134c..150278c0ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yj/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yj/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yj"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "sclevine"; repo = "yj"; - rev = "c4c13b7641389c76ea028b48091f851f3efb6376"; - sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr"; + rev = "v${version}"; + hash = "sha256-lsn5lxtix5W7po6nzvGcHmifbyhrtHgvaKYT7RPPCOg="; }; - vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; + vendorHash = "sha256-NeSOoL9wtFzq6ba8ghseB6D+Qq8Z5holQExcAUbtYrs="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix index 36658b506a..94c1cdaa01 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix @@ -1,28 +1,46 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, zed }: buildGoModule rec { pname = "zed"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; + sha256 = "sha256-er3BPQ10ERCIBn0xx0jjyMBybnUBMyX76tqYEYe2WYQ="; }; - vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; + vendorHash = "sha256-3PyyR9d5m33ohbcstREvTOtWwMIrbFNvFyBY1F+6R+4="; subPackages = [ "cmd/zed" "cmd/zq" ]; + ldflags = [ + "-s" + "-w" + "-X=github.com/brimdata/zed/cli.Version=${version}" + ]; + + passthru.tests = { + zed-version = testers.testVersion { + package = zed; + }; + zq-version = testers.testVersion { + package = zed; + command = "zq --version"; + }; + }; + meta = with lib; { description = "A novel data lake based on super-structured data"; - homepage = "https://github.com/brimdata/zed"; - license = licenses.bsd3; - maintainers = with maintainers; [ dit7ya ]; + homepage = "https://zed.brimdata.io"; changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ dit7ya knl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/zq/default.nix b/third_party/nixpkgs/pkgs/development/tools/zq/default.nix deleted file mode 100644 index c62de54360..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/zq/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildGoModule -, testers -, zq -}: - -buildGoModule rec { - pname = "zq"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "brimdata"; - repo = "zed"; - rev = "v${version}"; - hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; - }; - - vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; - - subPackages = [ "cmd/zq" ]; - - ldflags = [ "-s" "-X" "github.com/brimdata/zed/cli.Version=${version}" ]; - - passthru.tests = testers.testVersion { package = zq; }; - - meta = with lib; { - description = "A command-line tool for processing data in diverse input formats, providing search, analytics, and extensive transformations using the Zed language"; - homepage = "https://zed.brimdata.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ knl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 817e32e492..5bcdc41028 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.4.0"; + version = "0.5.5"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "T+vxwYM0zc1HsPiBncZolIquglKThsx2RDOS3/jPn4s="; + sha256 = "n7OfH93qXfu8608mMJ1tMoe9rAngu0cSHflwJZlKPYU="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "AEo4xXnePlQYTXepwSDUaG8NczPdTCbPGPzxgH+/HHo="; + sha256 = "YPX5+wfXumYSvdjSOgb0rc/RrIU9vMYEqQmhObsg3ak="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "w66xgmVepmC543apTTGLfeV3FMsLiiUpfqzzRhpaNy8="; + sha256 = "yiCpnO9Y8+m4fGIVyKyxeXMBe0e8qxoTAgOB8HHH4Nw="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "LMutdGNiGp4aLmeqMLk8Pc0xIjqgWPO6GSli1EfTgkY="; + sha256 = "4eziS6QRQzg/KyKrgAmyOrMxXb+YH2pNX1RX4dL/zhM="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 7d570f07ac..7dda8b1e7b 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.30.0"; + version = "1.30.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-He8RgzmiL8Zp+klm0JPNeqbyjK/5CsE7HB2Hco7GZss="; + sha256 = "sha256-Dg4ZX1CpjZuCXDu3GxbaRIwdhDuJ50j53b6XETfFGAU="; }; - cargoSha256 = "sha256-lPgVivYsR3SljPkjRRkb3qM3ZO7RALfk1KGPd7cwSYQ="; + cargoSha256 = "sha256-6V9djLUmPEQDewKEN0ND7zyXSrKdakXZdYSRsyXWNuE="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix index 5d1dfa5554..fa6dcbf28a 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix @@ -6,14 +6,13 @@ let python = python3; }; - npmPatches = callPackage ./npm-patches.nix { }; in buildNodejs { inherit enableNpm; - version = "18.13.0"; - sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx"; + version = "18.14.0"; + sha256 = "sha256-Qu+d0xmT1cjoKwqwlpE1CT5qKW76J7G+mvwErADwJno="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch - ] ++ npmPatches; + ]; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix index b9cd476a19..85739c36c1 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.5.0"; - sha256 = "sha256-KBMXvce6iVITi/jw9fB2SV95+G6FGmWb4fmD3sM8pXc="; + version = "19.6.0"; + sha256 = "sha256-UZxtVCqfmW8AwaPTsuXPUrfbmY2V9s7VqJPRagPeM+o="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix b/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix index 1542b120c9..e36521e191 100644 --- a/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix +++ b/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix @@ -26,9 +26,9 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.12"; sha256 = "0x8x922jhdn4zzbqqhlnzg5cmg69myn9zibk363py3yamkywcami"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1zi1x4w51fawi8083s48mxrlpqzkc48qsvrq2h7xx58x48ml465s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1wwciddbnykamlwl9i88l9081q27l0i17jmvymsxddbi0v9rr3sb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.13"; sha256 = "1k49nrz5rw1yglkjypmmnclahib2qiwm838008yahk00ysy039f4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "1a80w34yb700cvjzfcsq3c5sb32bk95ccgjfcvyqxkpzlgcc50xn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "1y2gnkrc788y9k79sygx7dmgkj674qwdajyrxizx0a70rwmjszmw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) @@ -36,11 +36,11 @@ (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.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.12"; sha256 = "0axj326a79h8762ahrxgpnzczivfvdjn2xa2np2djc7ybn6j3491"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.12"; sha256 = "0dfivz2wq18gsdn8b9d0v6q0lf2mvayl85nad7cvysfc93aw05jg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.12"; sha256 = "00s1flhzvxsdhgn469vc1q63qkcv05g5zqx10p1gsnzxjpdx01in"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1j615cjwkyjkvvc03pvwmfgqbh1z9aq08bvw0bnjkhs1qs6dz7x0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1w7kfgld8wcbqqyb1cpbnd6b08f83jfny2q70vb1qdqfn5bgcb1h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.13"; sha256 = "1xy7x37mkdiv907xbxxc0aijjhgi2hli1s79adqn4adw8fbn2aki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.13"; sha256 = "0ph1r2vhnqg7agk1zz4873983qy2i5nwa10q40ba3g96rdy2pg1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.13"; sha256 = "0ddygsnms3vfg6s7w2mcm7gqdmb4h7glrdj73hm1l42sndmn9p7v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "0l1bq22d85sm36hrsmyf74hir1fj0msqv0c6d4ba0b64b3rwhvg0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "0in8sk9bl2r2dgjf3ncvmqzbdnyvy2329bzmykmvsrq511c76gh3"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix index 9523a228f8..ef2f0c69ae 100644 --- a/third_party/nixpkgs/pkgs/games/anki/bin.nix +++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.56"; + version = "2.1.57"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-bois8+W/Jvte0HqC6Vi8WcXzrc8y8fKoW3ttbPb/v14="; + sha256 = "sha256-W8EQxvdOQRYHVKoYGu+6LNAHJZGsVQgdvNsRXOBVUKM="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-xd96wG+dElf6kSJ3jtdwfDhxJIv2r/o/JF2RcIwaZkg="; + sha256 = "sha256-NhCMmXuZj+Il/hhZZhbk7eLsmbfnqYlSRgw33xIbv8M="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-dYYgKEN6ytZ1CIH2+hK7H7xs3ISMbZGDv3w+Ie+ISlw="; + sha256 = "sha256-8gLtFoqJVvh1NfaSpNeH8+YecMln+A7UyqeSXWVEtmo="; }; }; diff --git a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix index 40b06d8826..542b414d8a 100644 --- a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix +++ b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix @@ -1,10 +1,10 @@ { stdenv , lib , fetchFromBitbucket -, makeDesktopItem -, copyDesktopItems , cmake +, copyDesktopItems , pkg-config +, makeWrapper , zlib , bzip2 , libjpeg @@ -16,57 +16,36 @@ stdenv.mkDerivation rec { pname = "ecwolf"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromBitbucket { owner = pname; repo = pname; rev = version; - sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk="; + sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g="; }; - nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; + nativeBuildInputs = [ cmake copyDesktopItems pkg-config ] + ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; - desktopItems = [ - (makeDesktopItem { - name = "ecwolf"; - exec = "ecwolf"; - comment = "Enhanced Wolfenstein 3D port"; - desktopName = "Wolfenstein 3D"; - categories = [ "Game" ]; - }) - ]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; - # Change the location where the ecwolf executable looks for the ecwolf.pk3 - # file. - # - # By default, it expects the PK3 file to reside in the same directory as the - # executable, which is not desirable. - # We will adjust the code so that it can be retrieved from the share/ - # directory. - - preConfigure = '' - sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h - '' - # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store - + lib.optionalString stdenv.isDarwin '' - sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt - ''; - - # Install the required PK3 file in the required data directory - postInstall = '' - mkdir -p $out/share/ecwolf - cp ecwolf.pk3 $out/share/ecwolf + # ECWolf installs its binary to the games/ directory, but Nix only adds bin/ + # directories to the PATH. + postInstall = lib.optionalString stdenv.isLinux '' + mv "$out/games" "$out/bin" + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -R ecwolf.app $out/Applications + makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf ''; meta = with lib; { description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ jayman2000 sander ]; platforms = platforms.all; - # On Darwin, the linker fails to find a bunch of symbols. - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix index bf94dfa067..eb39b3e19a 100644 --- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix +++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.3.13"; + version = "2020.3.17"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; - sha256 = "sha256-C3iUVA7IJQ77OdXcaBnSpDphMFjmFZmn0nozQvdxSJM="; + sha256 = "sha256-Kl66K5rmejaRKFgzps4/a73z8gIp9YcdfJQOFR1U2Og="; }; dontUnpack = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Zhq/r0davIz9G6tXVZRp76ZivG0D9Y6Nl3OFAD/lqow="; + sha256 = "sha256-ZnDe3qyiaDrKd/nwa/nR2AYq4yoqVFnd3IqgmJxfGFQ="; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index c8c0e730f1..f534f96154 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { pname = "heroic-unwrapped"; - version = "2.5.2"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - sha256 = "sha256-vyZH/uOE7Oph8TuBFM2cUFwM4ed8Ri3fKRUrl9A6zHc="; + sha256 = "sha256-QXciJkY5l5Oqzgnj9vV5IwOSUtVeLMH29r2EIQVt2LI="; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/games/heroic/package.json b/third_party/nixpkgs/pkgs/games/heroic/package.json index 77b1702d87..b5f5e0478f 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/package.json +++ b/third_party/nixpkgs/pkgs/games/heroic/package.json @@ -1,6 +1,6 @@ { "name": "heroic", - "version": "2.5.2", + "version": "2.6.2", "private": true, "main": "build/electron/main.js", "homepage": "./", @@ -39,7 +39,7 @@ } ], "win": { - "artifactName": "${productName}-${version}-Setup.${ext}", + "artifactName": "${productName}-${version}-Setup-${arch}.${ext}", "icon": "build/win_icon.ico", "asarUnpack": [ "build/bin/win32/legendary.exe", @@ -50,9 +50,10 @@ ] }, "portable": { - "artifactName": "${productName}-${version}-Portable.${ext}" + "artifactName": "${productName}-${version}-Portable-${arch}.${ext}" }, "mac": { + "artifactName": "${productName}-${version}-macOS-${arch}.${ext}", "target": "dmg", "category": "public.app-category.games", "icon": "build/icon.icns", @@ -145,7 +146,6 @@ "fs-extra": "^10.1.0", "fuse.js": "^6.6.2", "graceful-fs": "^4.2.10", - "heroic-wine-downloader": "^1.2.3", "howlongtobeat": "^1.7.0", "i18next": "^21.6.16", "i18next-fs-backend": "^1.1.4", @@ -164,28 +164,32 @@ "source-map-support": "^0.5.21", "steam-shortcut-editor": "^3.1.1", "systeminformation": "^5.15.0", + "ts-prune": "^0.10.3", "tslib": "^2.4.0" }, "scripts": { "start": "vite", "codecheck": "tsc --noEmit", + "find-deadcode": "ts-prune --error", "test": "jest", "test-watch": "jest --watch --maxWorkers=25%", "test:ci": "jest --runInBand --silent", "release:linux": "vite build && electron-builder -p always --linux deb AppImage rpm pacman tar.xz", - "release:mac": "vite build && electron-builder -p always --mac", - "release:win": "vite build && electron-builder -p always --win nsis portable", + "release:mac": "vite build && electron-builder -p always --mac --x64 --arm64", + "release:win": "vite build && electron-builder -p never --win nsis portable --x64 --arm64", "dist:linux": "vite build && electron-builder --linux", "dist:mac": "vite build && electron-builder --mac", "dist:win": "vite build && electron-builder --win", + "dist:flatpak": "yarn dist:linux appimage && yarn flatpak:prepare && yarn flatpak:build", "lint": "eslint --cache -c .eslintrc --ext .tsx,ts ./src", "lint-fix": "eslint --fix -c .eslintrc --ext .tsx,ts ./src", - "dist-flatpak": "cd flatpak && flatpak-builder build local.heroic.yml --install --force-clean --user", - "flatpak-test": "yarn dist:linux appimage && cd flatpak && flatpak-builder build local.heroic.yml --install --force-clean --user", + "flatpak:build": "cd flatpak-build && flatpak-builder build com.heroicgameslauncher.hgl.yml --install --force-clean --user", + "flatpak:prepare": "node ./flatpak/prepareFlatpak.js", + "flatpak:prepare-release": "node ./flatpak/prepareFlatpak.js release", "i18n": "i18next", "prepare": "husky install", - "prettier": "prettier --check .", - "prettier-fix": "prettier --write ." + "prettier": "prettier --check . '!flatpak-build'", + "prettier-fix": "prettier --write . '!flatpak-build'" }, "eslintConfig": { "extends": [ @@ -211,8 +215,8 @@ "@typescript-eslint/eslint-plugin": "^5.20.0", "@typescript-eslint/parser": "^5.20.0", "@vitejs/plugin-react": "^2.2.0", - "electron": "^21.2.1", - "electron-builder": "^23.1.0", + "electron": "^22.2.0", + "electron-builder": "^23.6.0", "electron-devtools-installer": "^3.2.0", "eslint": "^8.13.0", "eslint-config-prettier": "^8.5.0", @@ -226,6 +230,7 @@ "sass": "^1.55.0", "tmp": "^0.2.1", "ts-jest": "^28.0.7", + "type-fest": "^3.2.0", "typescript": "^4.8.4", "vite": "^3.2.2", "vite-plugin-electron": "^0.10.2", diff --git a/third_party/nixpkgs/pkgs/games/heroic/yarn.lock b/third_party/nixpkgs/pkgs/games/heroic/yarn.lock index 6c4d3f59b7..8e865bd6c9 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/yarn.lock +++ b/third_party/nixpkgs/pkgs/games/heroic/yarn.lock @@ -452,21 +452,20 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== +"@electron/get@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" + integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" - got "^9.6.0" + got "^11.8.5" progress "^2.0.3" semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" "@electron/universal@1.2.1": version "1.2.1" @@ -1141,10 +1140,10 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.46.tgz#57501b58023776dbbae9e25619146286440be34c" integrity sha512-ng4ut1z2MCBhK/NwDVwIQp3pAUOCs/KNaW3cBxdFB2xTDrOuo1xuNmpr/9HHFhxqIvHrs1NTH3KJg6q+JSy1Kw== -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== "@sinonjs/commons@^1.7.0": version "1.8.3" @@ -1242,12 +1241,12 @@ "@svgr/hast-util-to-babel-ast" "^6.4.0" svg-parser "^2.0.4" -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== dependencies: - defer-to-connect "^1.0.1" + defer-to-connect "^2.0.0" "@testing-library/dom@^7.31.0": version "7.31.2" @@ -1311,6 +1310,16 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@ts-morph/common@~0.12.3": + version "0.12.3" + resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.12.3.tgz#a96e250217cd30e480ab22ec6a0ebbe65fd784ff" + integrity sha512-4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w== + dependencies: + fast-glob "^3.2.7" + minimatch "^3.0.4" + mkdirp "^1.0.4" + path-browserify "^1.0.1" + "@types/aria-query@^4.2.0": version "4.2.2" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" @@ -1349,6 +1358,16 @@ dependencies: "@babel/types" "^7.3.0" +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@types/responselike" "^1.0.0" + "@types/classnames@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd" @@ -1414,7 +1433,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graceful-fs@^4.1.3", "@types/graceful-fs@^4.1.5": +"@types/graceful-fs@^4.1.3": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== @@ -1433,6 +1452,11 @@ resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== +"@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" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== + "@types/i18next-fs-backend@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@types/i18next-fs-backend/-/i18next-fs-backend-1.1.2.tgz#4f3116769229371fcdf64bbdb6841ea745e392f9" @@ -1490,6 +1514,13 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" + "@types/mdast@^3.0.0": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" @@ -1613,6 +1644,13 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" + "@types/scheduler@*": version "0.16.2" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" @@ -2037,13 +2075,6 @@ axios@^0.22: dependencies: follow-redirects "^1.14.4" -axios@^0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" - integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== - dependencies: - follow-redirects "^1.14.4" - axios@^0.26.1: version "0.26.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" @@ -2324,18 +2355,23 @@ builder-util@23.6.0: stat-mode "^1.0.0" temp-file "^3.4.0" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== +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== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" http-cache-semantics "^4.0.0" - keyv "^3.0.0" + keyv "^4.0.0" lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + normalize-url "^6.0.1" + responselike "^2.0.0" call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -2528,6 +2564,11 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== +code-block-writer@^11.0.0: + version "11.0.3" + resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz#9eec2993edfb79bfae845fbc093758c0a0b73b76" + integrity sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw== + collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -2591,6 +2632,11 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +commander@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + commander@~9.4.1: version "9.4.1" resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" @@ -2632,14 +2678,6 @@ conf@^10.2.0: pkg-up "^3.1.0" semver "^7.3.5" -config-chain@^1.1.11: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" @@ -2836,12 +2874,12 @@ decode-named-character-reference@^1.0.0: dependencies: character-entities "^2.0.0" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== dependencies: - mimic-response "^1.0.0" + mimic-response "^3.1.0" dedent@^0.7.0: version "0.7.0" @@ -2858,10 +2896,10 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +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, define-properties@^1.1.4: version "1.1.4" @@ -3072,11 +3110,6 @@ dotenv@^9.0.2: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== -duplexer3@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" - integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== - duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -3094,7 +3127,7 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-builder@^23.1.0: +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== @@ -3175,12 +3208,12 @@ electron-updater@^5.0.1: semver "^7.3.5" typed-emitter "^2.1.0" -electron@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.1.tgz#a6bbf4fee7ed985c739cc0d87fbef0ea4559da57" - integrity sha512-RLuFstGpHk1wtCRm9Kd+mhLjHZ5+m83+GQ/CsVl06OT7ikCT68yXMEgPmSkgmN5WjzlorsK6H5hIk9Sf6P/7Lg== +electron@^22.2.0: + version "22.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5" + integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g== dependencies: - "@electron/get" "^1.14.1" + "@electron/get" "^2.0.0" "@types/node" "^16.11.26" extract-zip "^2.0.1" @@ -3194,11 +3227,6 @@ 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== -encodeurl@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -3714,7 +3742,7 @@ fast-fifo@^1.0.0: resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz#17d1a3646880b9891dfa0c54e69c5fef33cad779" integrity sha512-Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g== -fast-glob@^3.2.9: +fast-glob@^3.2.7, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -3979,13 +4007,6 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - get-stream@^5.0.0, get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" @@ -4068,16 +4089,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -4109,24 +4120,24 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== +got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.8, graceful-fs@^4.2.9: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -4214,15 +4225,6 @@ heimdalljs@^0.2.6: dependencies: rsvp "~3.2.1" -heroic-wine-downloader@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/heroic-wine-downloader/-/heroic-wine-downloader-1.2.3.tgz#e415709b0d6e1e6feb109261cded50c04073439c" - integrity sha512-njiJ+/hg1PhwGVwTtlm++6qQHVI6rWQtGSi/BA4gLkctt/rb7uYHnX8tkTq6EisXaWVeF5rXNInojH9047PPxw== - dependencies: - "@types/graceful-fs" "^4.1.5" - axios "^0.24.0" - graceful-fs "^4.2.8" - hoist-non-react-statics@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" @@ -4270,9 +4272,9 @@ htmlparser2@^8.0.1: entities "^4.3.0" http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + 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== http-proxy-agent@^5.0.0: version "5.0.0" @@ -4283,6 +4285,14 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "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" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -4423,11 +4433,6 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - ini@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d" @@ -5193,10 +5198,10 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== json-parse-even-better-errors@^2.3.0: version "2.3.1" @@ -5229,12 +5234,17 @@ json-stringify-safe@^5.0.1: integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" +json5@^2.1.3: + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== + json5@^2.2.0, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" @@ -5274,12 +5284,12 @@ jszip@^3.1.0: readable-stream "~2.3.6" setimmediate "^1.0.5" -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +keyv@^4.0.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" + integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== dependencies: - json-buffer "3.0.0" + json-buffer "3.0.1" kleur@^3.0.3: version "3.0.3" @@ -5382,7 +5392,7 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: +lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5394,11 +5404,6 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -5744,11 +5749,16 @@ mimic-fn@^3.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== -mimic-response@^1.0.0, mimic-response@^1.0.1: +mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +mimic-response@^3.1.0: + version "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== + min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -5802,7 +5812,7 @@ mkdirp@^0.5.1: dependencies: minimist "^1.2.6" -mkdirp@^1.0.3: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -5887,10 +5897,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== now-and-later@^2.0.0: version "2.0.1" @@ -5899,14 +5909,6 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - npm-run-path@^4.0.0, npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -6021,10 +6023,10 @@ ordered-read-streams@^1.0.0: dependencies: readable-stream "^2.0.1" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" @@ -6103,6 +6105,11 @@ parse5@^7.0.0: dependencies: entities "^4.4.0" +path-browserify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" @@ -6158,11 +6165,6 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - pirates@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" @@ -6209,11 +6211,6 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== - prettier@^2.6.2: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" @@ -6306,11 +6303,6 @@ property-information@^6.0.0: resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d" integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg== -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== - pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -6351,6 +6343,11 @@ queue-tick@^1.0.0: resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142" integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag== +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + quick-temp@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408" @@ -6649,6 +6646,11 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -6696,12 +6698,12 @@ resolve@^2.0.0-next.3: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== dependencies: - lowercase-keys "^1.0.0" + lowercase-keys "^2.0.0" reusify@^1.0.4: version "1.0.4" @@ -7293,11 +7295,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -7327,6 +7324,11 @@ trough@^2.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876" integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g== +"true-myth@^4.1.0": + version "4.1.1" + resolved "https://registry.yarnpkg.com/true-myth/-/true-myth-4.1.1.tgz#ff4ac9d5130276e34aa338757e2416ec19248ba2" + integrity sha512-rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg== + truncate-utf8-bytes@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" @@ -7348,6 +7350,26 @@ ts-jest@^28.0.7: semver "7.x" yargs-parser "^21.0.1" +ts-morph@^13.0.1: + version "13.0.3" + resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-13.0.3.tgz#c0c51d1273ae2edb46d76f65161eb9d763444c1d" + integrity sha512-pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw== + dependencies: + "@ts-morph/common" "~0.12.3" + code-block-writer "^11.0.0" + +ts-prune@^0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/ts-prune/-/ts-prune-0.10.3.tgz#b6c71a525543b38dcf947a7d3adfb7f9e8b91f38" + integrity sha512-iS47YTbdIcvN8Nh/1BFyziyUqmjXz7GVzWu02RaZXqb+e/3Qe1B7IQ4860krOeCGUeJmterAlaM2FRH0Ue0hjw== + dependencies: + commander "^6.2.1" + cosmiconfig "^7.0.1" + json5 "^2.1.3" + lodash "^4.17.21" + "true-myth" "^4.1.0" + ts-morph "^13.0.1" + tsconfig-paths@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" @@ -7375,11 +7397,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -7412,6 +7429,11 @@ type-fest@^2.17.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== +type-fest@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.2.0.tgz#2c8b49e775d9e314a73ea6fcee0b2e8549d5f886" + integrity sha512-Il3wdLRzWvbAEtocgxGQA9YOoRVeVUGOMBtel5LdEpNeEAol6GJTLw8GbX6Z8EIMfvfhoOXs2bwOijtAZdK5og== + typed-emitter@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/typed-emitter/-/typed-emitter-2.1.0.tgz#ca78e3d8ef1476f228f548d62e04e3d4d3fd77fb" @@ -7574,13 +7596,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== - dependencies: - prepend-http "^2.0.0" - user-agents@^1.0.580: version "1.0.1204" resolved "https://registry.yarnpkg.com/user-agents/-/user-agents-1.0.1204.tgz#fae75805505b0405dad1a32663cb39ac911d3154" diff --git a/third_party/nixpkgs/pkgs/games/heroic/yarn.nix b/third_party/nixpkgs/pkgs/games/heroic/yarn.nix index d8851bfbfd..dd85f32653 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/yarn.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/yarn.nix @@ -442,11 +442,11 @@ }; } { - name = "_electron_get___get_1.14.1.tgz"; + name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { - name = "_electron_get___get_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; - sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + name = "_electron_get___get_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; + sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; }; } { @@ -1050,11 +1050,11 @@ }; } { - name = "_sindresorhus_is___is_0.14.0.tgz"; + name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { - name = "_sindresorhus_is___is_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + name = "_sindresorhus_is___is_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; } { @@ -1170,11 +1170,11 @@ }; } { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; path = fetchurl { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; } { @@ -1225,6 +1225,14 @@ sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } + { + name = "_ts_morph_common___common_0.12.3.tgz"; + path = fetchurl { + name = "_ts_morph_common___common_0.12.3.tgz"; + url = "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.12.3.tgz"; + sha512 = "4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w=="; + }; + } { name = "_types_aria_query___aria_query_4.2.2.tgz"; path = fetchurl { @@ -1265,6 +1273,14 @@ sha512 = "FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg=="; }; } + { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + path = fetchurl { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; + sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; + }; + } { name = "_types_classnames___classnames_2.3.1.tgz"; path = fetchurl { @@ -1369,6 +1385,14 @@ sha512 = "qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="; }; } + { + 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"; + url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; + sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; + }; + } { name = "_types_i18next_fs_backend___i18next_fs_backend_1.1.2.tgz"; path = fetchurl { @@ -1441,6 +1465,14 @@ sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; }; } + { + name = "_types_keyv___keyv_3.1.4.tgz"; + path = fetchurl { + name = "_types_keyv___keyv_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; + sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; + }; + } { name = "_types_mdast___mdast_3.0.10.tgz"; path = fetchurl { @@ -1593,6 +1625,14 @@ sha512 = "wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q=="; }; } + { + name = "_types_responselike___responselike_1.0.0.tgz"; + path = fetchurl { + name = "_types_responselike___responselike_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; + }; + } { name = "_types_scheduler___scheduler_0.16.2.tgz"; path = fetchurl { @@ -2049,14 +2089,6 @@ sha512 = "Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w=="; }; } - { - name = "axios___axios_0.24.0.tgz"; - path = fetchurl { - name = "axios___axios_0.24.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - } { name = "axios___axios_0.26.1.tgz"; path = fetchurl { @@ -2346,11 +2378,19 @@ }; } { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; path = fetchurl { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + }; + } + { + name = "cacheable_request___cacheable_request_7.0.2.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=="; }; } { @@ -2577,6 +2617,14 @@ sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; } + { + name = "code_block_writer___code_block_writer_11.0.3.tgz"; + path = fetchurl { + name = "code_block_writer___code_block_writer_11.0.3.tgz"; + url = "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz"; + sha512 = "NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw=="; + }; + } { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; path = fetchurl { @@ -2665,6 +2713,14 @@ sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } + { + name = "commander___commander_6.2.1.tgz"; + path = fetchurl { + name = "commander___commander_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; + sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; + }; + } { name = "commander___commander_9.4.1.tgz"; path = fetchurl { @@ -2705,14 +2761,6 @@ sha512 = "8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="; }; } - { - name = "config_chain___config_chain_1.1.13.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - } { name = "convert_source_map___convert_source_map_1.9.0.tgz"; path = fetchurl { @@ -2954,11 +3002,11 @@ }; } { - name = "decompress_response___decompress_response_3.3.0.tgz"; + name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { - name = "decompress_response___decompress_response_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; + name = "decompress_response___decompress_response_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; } { @@ -2986,11 +3034,11 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; path = fetchurl { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; + sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; } { @@ -3100,18 +3148,16 @@ { name = "9e7de2a6d917591f10a66389e62e1dc053c04fec"; path = - let - repo = fetchgit { - url = "https://github.com/discordjs/rpc.git"; - rev = "9e7de2a6d917591f10a66389e62e1dc053c04fec"; - sha256 = "1idb6k8h15a2pmbgs5xw5c2d763kgxg2ykx60vq0gdbhq73wz32j"; - }; - in - runCommand "9e7de2a6d917591f10a66389e62e1dc053c04fec" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C ${repo} . - ''; + let repo = fetchgit { + url = "https://github.com/discordjs/rpc.git"; + rev = "9e7de2a6d917591f10a66389e62e1dc053c04fec"; + sha256 = "1idb6k8h15a2pmbgs5xw5c2d763kgxg2ykx60vq0gdbhq73wz32j"; + }; + in runCommand "9e7de2a6d917591f10a66389e62e1dc053c04fec" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; } { name = "dmg_builder___dmg_builder_23.6.0.tgz"; @@ -3241,14 +3287,6 @@ sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } - { - name = "duplexer3___duplexer3_0.1.5.tgz"; - path = fetchurl { - name = "duplexer3___duplexer3_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz"; - sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; - }; - } { name = "duplexify___duplexify_3.7.1.tgz"; path = fetchurl { @@ -3322,11 +3360,11 @@ }; } { - name = "electron___electron_21.2.1.tgz"; + name = "electron___electron_22.2.0.tgz"; path = fetchurl { - name = "electron___electron_21.2.1.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-21.2.1.tgz"; - sha512 = "RLuFstGpHk1wtCRm9Kd+mhLjHZ5+m83+GQ/CsVl06OT7ikCT68yXMEgPmSkgmN5WjzlorsK6H5hIk9Sf6P/7Lg=="; + name = "electron___electron_22.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz"; + sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g=="; }; } { @@ -3345,14 +3383,6 @@ sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } - { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - } { name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { @@ -4185,14 +4215,6 @@ sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; } - { - name = "get_stream___get_stream_4.1.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - } { name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { @@ -4265,14 +4287,6 @@ sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } - { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - path = fetchurl { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; - }; - } { name = "globals___globals_11.12.0.tgz"; path = fetchurl { @@ -4306,11 +4320,11 @@ }; } { - name = "got___got_9.6.0.tgz"; + name = "got___got_11.8.6.tgz"; path = fetchurl { - name = "got___got_9.6.0.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + name = "got___got_11.8.6.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; + sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; }; } { @@ -4433,14 +4447,6 @@ sha512 = "o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA=="; }; } - { - name = "heroic_wine_downloader___heroic_wine_downloader_1.2.3.tgz"; - path = fetchurl { - name = "heroic_wine_downloader___heroic_wine_downloader_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/heroic-wine-downloader/-/heroic-wine-downloader-1.2.3.tgz"; - sha512 = "njiJ+/hg1PhwGVwTtlm++6qQHVI6rWQtGSi/BA4gLkctt/rb7uYHnX8tkTq6EisXaWVeF5rXNInojH9047PPxw=="; - }; - } { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; path = fetchurl { @@ -4490,11 +4496,11 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; } { @@ -4505,6 +4511,14 @@ sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } + { + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + path = fetchurl { + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; + sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; + }; + } { name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; path = fetchurl { @@ -4665,14 +4679,6 @@ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } - { - name = "ini___ini_1.3.8.tgz"; - path = fetchurl { - name = "ini___ini_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - } { name = "ini___ini_3.0.1.tgz"; path = fetchurl { @@ -5362,11 +5368,11 @@ }; } { - name = "json_buffer___json_buffer_3.0.0.tgz"; + name = "json_buffer___json_buffer_3.0.1.tgz"; path = fetchurl { - name = "json_buffer___json_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; + name = "json_buffer___json_buffer_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; } { @@ -5418,11 +5424,19 @@ }; } { - name = "json5___json5_1.0.1.tgz"; + name = "json5___json5_1.0.2.tgz"; path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + name = "json5___json5_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz"; + sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; + }; + } + { + name = "json5___json5_2.2.2.tgz"; + path = fetchurl { + name = "json5___json5_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; } { @@ -5466,11 +5480,11 @@ }; } { - name = "keyv___keyv_3.1.0.tgz"; + name = "keyv___keyv_4.5.2.tgz"; path = fetchurl { - name = "keyv___keyv_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + name = "keyv___keyv_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; + sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; }; } { @@ -5625,14 +5639,6 @@ sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; } - { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; - }; - } { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; path = fetchurl { @@ -5977,6 +5983,14 @@ sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; } + { + name = "mimic_response___mimic_response_3.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; + }; + } { name = "min_indent___min_indent_1.0.1.tgz"; path = fetchurl { @@ -6162,11 +6176,11 @@ }; } { - name = "normalize_url___normalize_url_4.5.1.tgz"; + name = "normalize_url___normalize_url_6.1.0.tgz"; path = fetchurl { - name = "normalize_url___normalize_url_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + name = "normalize_url___normalize_url_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; } { @@ -6177,14 +6191,6 @@ sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; } - { - name = "npm_conf___npm_conf_1.1.3.tgz"; - path = fetchurl { - name = "npm_conf___npm_conf_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; - }; - } { name = "npm_run_path___npm_run_path_4.0.1.tgz"; path = fetchurl { @@ -6306,11 +6312,11 @@ }; } { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; + name = "p_cancelable___p_cancelable_2.1.1.tgz"; path = fetchurl { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + name = "p_cancelable___p_cancelable_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; } { @@ -6401,6 +6407,14 @@ sha512 = "kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg=="; }; } + { + name = "path_browserify___path_browserify_1.0.1.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz"; + sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; + }; + } { name = "path_dirname___path_dirname_1.0.2.tgz"; path = fetchurl { @@ -6489,14 +6503,6 @@ sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } - { - name = "pify___pify_3.0.0.tgz"; - path = fetchurl { - name = "pify___pify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; - }; - } { name = "pirates___pirates_4.0.5.tgz"; path = fetchurl { @@ -6553,14 +6559,6 @@ sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; } - { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; - }; - } { name = "prettier___prettier_2.7.1.tgz"; path = fetchurl { @@ -6657,14 +6655,6 @@ sha512 = "kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg=="; }; } - { - name = "proto_list___proto_list_1.2.4.tgz"; - path = fetchurl { - name = "proto_list___proto_list_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; - }; - } { name = "pump___pump_2.0.1.tgz"; path = fetchurl { @@ -6713,6 +6703,14 @@ sha512 = "kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="; }; } + { + name = "quick_lru___quick_lru_5.1.1.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + }; + } { name = "quick_temp___quick_temp_0.1.8.tgz"; path = fetchurl { @@ -6932,18 +6930,16 @@ { name = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; path = - let - repo = fetchgit { - url = "https://github.com/devsnek/node-register-scheme.git"; - rev = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; - sha256 = "0j4ycczsjpmha35arvijrxrsx8f110az9qhdw20plyh23fd4kvy6"; - }; - in - runCommand "e7cc9a63a1f512565da44cb57316d9fb10750e17" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C ${repo} . - ''; + let repo = fetchgit { + url = "https://github.com/devsnek/node-register-scheme.git"; + rev = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; + sha256 = "0j4ycczsjpmha35arvijrxrsx8f110az9qhdw20plyh23fd4kvy6"; + }; + in runCommand "e7cc9a63a1f512565da44cb57316d9fb10750e17" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; } { name = "remark_parse___remark_parse_10.0.1.tgz"; @@ -7017,6 +7013,14 @@ sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; } + { + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; + path = fetchurl { + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; + }; + } { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; path = fetchurl { @@ -7074,11 +7078,11 @@ }; } { - name = "responselike___responselike_1.0.2.tgz"; + name = "responselike___responselike_2.0.1.tgz"; path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; + name = "responselike___responselike_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; } { @@ -7793,14 +7797,6 @@ sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; } - { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - path = fetchurl { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - } { name = "to_regex_range___to_regex_range_5.0.1.tgz"; path = fetchurl { @@ -7841,6 +7837,14 @@ sha512 = "AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g=="; }; } + { + name = "true_myth___true_myth_4.1.1.tgz"; + path = fetchurl { + name = "true_myth___true_myth_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/true-myth/-/true-myth-4.1.1.tgz"; + sha512 = "rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg=="; + }; + } { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; path = fetchurl { @@ -7857,6 +7861,22 @@ sha512 = "5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg=="; }; } + { + name = "ts_morph___ts_morph_13.0.3.tgz"; + path = fetchurl { + name = "ts_morph___ts_morph_13.0.3.tgz"; + url = "https://registry.yarnpkg.com/ts-morph/-/ts-morph-13.0.3.tgz"; + sha512 = "pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw=="; + }; + } + { + name = "ts_prune___ts_prune_0.10.3.tgz"; + path = fetchurl { + name = "ts_prune___ts_prune_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/ts-prune/-/ts-prune-0.10.3.tgz"; + sha512 = "iS47YTbdIcvN8Nh/1BFyziyUqmjXz7GVzWu02RaZXqb+e/3Qe1B7IQ4860krOeCGUeJmterAlaM2FRH0Ue0hjw=="; + }; + } { name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; path = fetchurl { @@ -7889,14 +7909,6 @@ sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; } - { - name = "tunnel___tunnel_0.0.6.tgz"; - path = fetchurl { - name = "tunnel___tunnel_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; - }; - } { name = "type_check___type_check_0.4.0.tgz"; path = fetchurl { @@ -7945,6 +7957,14 @@ sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; }; } + { + name = "type_fest___type_fest_3.2.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-3.2.0.tgz"; + sha512 = "Il3wdLRzWvbAEtocgxGQA9YOoRVeVUGOMBtel5LdEpNeEAol6GJTLw8GbX6Z8EIMfvfhoOXs2bwOijtAZdK5og=="; + }; + } { name = "typed_emitter___typed_emitter_2.1.0.tgz"; path = fetchurl { @@ -8129,14 +8149,6 @@ sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } - { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; - }; - } { name = "user_agents___user_agents_1.0.1204.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix index f8f0d55fb9..1eabfe77a7 100644 --- a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1h"; + version = "12.1i"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-9ChPO0YCsrAyQ81TAbKCMJSgSXoUtkvvNPMTPimPBUo="; + sha256 = "sha256-TMPumyTEzDbV/31UgwXJwr7zt7ufENX3ESxlcBEnaSc="; }; CXXFLAGS = [ diff --git a/third_party/nixpkgs/pkgs/games/lunar-client/default.nix b/third_party/nixpkgs/pkgs/games/lunar-client/default.nix index 8bb2e0d0a6..3bc493f5d0 100644 --- a/third_party/nixpkgs/pkgs/games/lunar-client/default.nix +++ b/third_party/nixpkgs/pkgs/games/lunar-client/default.nix @@ -2,7 +2,7 @@ let name = "lunar-client"; - version = "2.10.1"; + version = "2.15.1"; desktopItem = makeDesktopItem { name = "lunar-client"; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - hash = "sha256-3h2FFpIIRta6hEsa/H0xo8+DUvhdQyBv9dqdd/vlwZ4="; + hash = "sha256-8F6inLctNLCrTvO/f4IWHclpm/6vqW44NKbct0Epp4s="; }; in appimageTools.wrapType1 rec { diff --git a/third_party/nixpkgs/pkgs/games/openttd/default.nix b/third_party/nixpkgs/pkgs/games/openttd/default.nix index 7aac53ae94..61c7c0bb86 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/default.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "12.2"; + version = "13.0"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-gVCPDek6DCZLIW71agX4OB//e/+m0BASGiFJC02s6Vw="; + hash = "sha256-M5344OCCcIfIOv54+O/GpzsKPYqVCgtTE3zm6KrXq2c="; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { - observe as spectators ''; homepage = "https://www.openttd.org/"; + changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jcumming fpletz ]; diff --git a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix index a0c70e463b..12f4660ba3 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.47.1"; + version = "0.50.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-AMd2KXy/ODByeV9CkEd51KbE/+fZ8Us3WzsWCnn7nh0="; + hash = "sha256-VJ8Qd4wiFbX/aY8pEWlh9wEjML0c7P8yrOC1fiQD7ts="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/third_party/nixpkgs/pkgs/games/otto-matic/default.nix b/third_party/nixpkgs/pkgs/games/otto-matic/default.nix index 17b63b2630..a3d75bc34a 100644 --- a/third_party/nixpkgs/pkgs/games/otto-matic/default.nix +++ b/third_party/nixpkgs/pkgs/games/otto-matic/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "OttoMatic"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256-eHy5yED5qrgHqKuqq1dXhmuR2PQBE5aMhSLPoydlpPk="; + sha256 = "sha256-0mqOAdAmJGxKa6yXktrbmdXkoQIliimq37iy9bCBZYg="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix index 7f6ba52dcc..4abd40e24a 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "prismlauncher"; - version = "6.1"; + version = "6.3"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = version; - sha256 = "sha256-aIBaenSnssv0/r2+UT5R4nBwo2QBGZ1Zp0CWOeiaeDE="; + sha256 = "sha256-7tptHKWkbdxTn6VIPxXE1K3opKRiUW2zv9r6J05dcS8="; }; nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix index 2e9c09bc62..522a8e39fd 100644 --- a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix +++ b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.10"; + version = "8.20"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-/BbMR/ZPjHbKzQ+I1+Vgh3/zenLjW3TnmrKhKPR6Gdk="; + sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index b036ded0b7..97976f9d66 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.6"; + version = "4.4.11"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-I4EKYoN+36a65mcZ2UWH3Ws75Ojdmpw/6flKFmEuIk8="; + hash = "sha256-UvTEqptA9Dp1wdri12sAYDB6rjiZCvk2tiG5i0AWU78="; }; dontUnpack = true; @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ tex ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/games/unvanquished/default.nix b/third_party/nixpkgs/pkgs/games/unvanquished/default.nix index 5a088f34a4..98b8917f6e 100644 --- a/third_party/nixpkgs/pkgs/games/unvanquished/default.nix +++ b/third_party/nixpkgs/pkgs/games/unvanquished/default.nix @@ -33,15 +33,15 @@ }: let - version = "0.53.2"; - binary-deps-version = "6"; + version = "0.54.0"; + binary-deps-version = "8"; src = fetchFromGitHub { owner = "Unvanquished"; repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E="; + sha256 = "sha256-X2c6BHI4W6fOurLiBWIBZzJrZ+7RHMEwN8GJGz6e350="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -50,8 +50,8 @@ let version = binary-deps-version; src = fetchzip { - url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; - sha256 = "sha256-ERfg89oTf9JTtv/qRnTRIzFP+zMpHT8W4WAIxqogy9E="; + url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz "; + sha256 = "sha256-6r9j0HRMDC/7i8f4f5bBK4NmwsTpSChHrRWwz0ENAZo="; }; dontPatchELF = true; @@ -119,7 +119,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ="; + outputHash = "sha256-ua9Q5E5C4t8z/yNQp6qn1i9NNDAk4ohzvgpMbCBxb8Q="; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; @@ -135,9 +135,10 @@ in stdenv.mkDerivation rec { inherit version src binary-deps-version; preConfigure = '' - mkdir daemon/external_deps/linux64-${binary-deps-version}/ - cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/ - chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ + TARGET="linux-amd64-default_${binary-deps-version}" + mkdir daemon/external_deps/"$TARGET" + cp -r ${unvanquished-binary-deps}/* daemon/external_deps/"$TARGET"/ + chmod +w -R daemon/external_deps/"$TARGET"/ ''; nativeBuildInputs = [ @@ -202,7 +203,7 @@ in stdenv.mkDerivation rec { for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do install -Dm0755 -t $out/lib/ $f done - install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe + install -Dm0644 -t $out/lib/ irt_core-amd64.nexe mkdir $out/bin/ ${wrapBinary "daemon" "unvanquished"} diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index d199918218..659d96175d 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: +{ lib +, stdenv +, fetchzip +, glib +, jre +, makeWrapper +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.10"; + version = "3.6.11"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-YQUKYsuDaCHChiRBQOKr813ptyc4UxZQ5aQFeC6tutU="; + sha256 = "sha256-t05rwP33/V2S5pkWjv87GmPHtYCMrMxT3o3cOrwytK4="; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + glib + ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; installPhase = '' runHook preInstall @@ -37,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; + mainProgram = "vassal"; }; } diff --git a/third_party/nixpkgs/pkgs/games/vcmi/default.nix b/third_party/nixpkgs/pkgs/games/vcmi/default.nix index f38053a65a..632d4fe7f2 100644 --- a/third_party/nixpkgs/pkgs/games/vcmi/default.nix +++ b/third_party/nixpkgs/pkgs/games/vcmi/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY="; + hash = "sha256-/BHpAXOCLi6d0+/uE79g8p6YO1swizItAwVlPVf/nkQ="; }; postPatch = '' @@ -69,7 +69,9 @@ stdenv.mkDerivation rec { # Upstream assumes relative value while Nixpkgs passes absolute. # Both should be allowed: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html # Meanwhile work it around by passing a relative value. + "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" + "-DCMAKE_INSTALL_DATAROOTDIR:STRING=share" ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix b/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix new file mode 100644 index 0000000000..b6d0d59367 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, cmake +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, physfs +, SDL2 +, SDL2_mixer +, tinyxml-2 +, utf8cpp +, Foundation +, IOKit +, makeAndPlay ? false +}: + +stdenv.mkDerivation rec { + pname = "vvvvvv"; + version = "2.3.6"; + + src = fetchFromGitHub { + owner = "TerryCavanagh"; + repo = "VVVVVV"; + rev = version; + sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; + }; + sourceRoot = "source/desktop_version"; + dataZip = fetchurl { + url = "https://thelettervsixtim.es/makeandplay/data.zip"; + name = "data.zip"; + sha256 = "sha256-x2eAlZT2Ry2p9WE252ZX44ZA1YQWSkYRIlCsYpPswOo="; + meta.license = lib.licenses.unfree; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + physfs + SDL2 + SDL2_mixer + tinyxml-2 + utf8cpp + ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]; + + # Help CMake find SDL_mixer.h + NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; + + cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "VVVVVV"; + desktopName = "VVVVVV"; + comment = meta.description; + exec = pname; + icon = "VVVVVV"; + terminal = false; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 VVVVVV $out/bin/${pname} + install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png" + + wrapProgram $out/bin/${pname} --add-flags "-assets ${dataZip}" + + runHook postInstall + ''; + + meta = with lib; { + description = "A retro-styled platform game" + lib.optionalString makeAndPlay " (redistributable, without original levels)"; + longDescription = '' + VVVVVV is a platform game all about exploring one simple mechanical + idea - what if you reversed gravity instead of jumping? + '' + lib.optionalString makeAndPlay '' + (Redistributable version, doesn't include the original levels.) + ''; + homepage = "https://thelettervsixtim.es"; + license = licenses.unfree; + maintainers = with maintainers; [ martfont ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index 6b5e0c117c..75ea0d23e0 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.7"; + version = "1.16.8"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk="; + hash = "sha256-P7OUiKJxJZ0rGdesnxpQMbRBgCHsLpyt8+pRDh27JYQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { libvorbis fribidi dbus libpng pcre openssl icu ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + meta = with lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index a5091c525d..4edd8d0d85 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.1.2-1"; src = fetchzip { - url = "https://onlinesupport.fujixerox.com/driver_downloads/fxlinuxpdf112119031.zip"; + url = "https://support-fb.fujifilm.com/driver_downloads/fxlinuxpdf112119031.zip"; sha256 = "1mv07ch6ysk9bknfmjqsgxb803sj6vfin29s9knaqv17jvgyh0n3"; curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise }; diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index 2a4f51048b..1a737ae3ab 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "5.1.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-IbLSNgf4uB8JFNsCXkmkK+w4qhirpd8/ALEfVzGCTUA="; + hash = "sha256-meUKWAFKT6EgHtzgR6jjDCA8EUD1kVoT3reXaRheukw="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -31,7 +31,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-fBU7829heM6T6Ba2r984qdd19VCuOP72jYwYCP7ECBU="; + vendorHash = "sha256-yyptdLkC0x2npZu2oEbvSJXIWShnSrQ0n6cPrDUlrCw="; nativeBuildInputs = [ installShellFiles @@ -49,8 +49,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20221224152051/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-IjakfeqjHshlGoamRJTnhUC8cTVMIY63F3vO6I/ZHO4="; + url = "https://web.archive.org/web/20230207211120/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-Vkl8V5AkiJMZLswSN0vTnz7S7/5lXftlWD5UZh//vUw="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix b/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix index 03a402225f..57baeb7fe8 100644 --- a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix +++ b/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix @@ -2,18 +2,23 @@ buildPythonApplication rec { pname = "frescobaldi"; - version = "3.1.3"; + version = "3.2"; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; rev = "v${version}"; - sha256 = "1p8f4vn2dpqndw1dylmg7wms6vi69zcfj544c908s4r8rrmbycyf"; + sha256 = "sha256-q340ChF7VZcbLMW/nd1so7WScsPfbdeJUjTzsY5dkec="; }; propagatedBuildInputs = with python3Packages; [ - lilypond pygame python-ly sip_4 - pyqt5 poppler-qt5 + qpageview + lilypond + pygame + python-ly + sip_4 + pyqt5 + poppler-qt5 pyqtwebengine ]; @@ -30,7 +35,7 @@ buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" + "\${qtWrapperArgs[@]}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix index a2a7e79691..b5f812d002 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd, config }: let beat = package: extraArgs: buildGoModule (rec { pname = package; @@ -36,10 +36,12 @@ rec { metricbeat7 = beat "metricbeat" { meta.description = "Lightweight shipper for metrics"; passthru.tests = - assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath; - { - elk = nixosTests.elk.ELK-7; - }; + lib.optionalAttrs config.allowUnfree ( + assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.unfree.ELK-7; + } + ); }; packetbeat7 = beat "packetbeat" { buildInputs = [ libpcap ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index dfa52606c8..145c98496b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -84,8 +84,13 @@ let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; }; + rustPlatform = pkgs.makeRustPlatform { + inherit (pkgs.darwin.apple_sdk_11_0) stdenv; + inherit (pkgs) rustc cargo; + }; + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { - inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild; + inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; apple_sdk = prev.darwin.apple_sdk_11_0; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix new file mode 100644 index 0000000000..37440659d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: + +let + arch = if stdenv.isAarch64 then "arm64" else "x86_64"; +in +stdenv.mkDerivation rec { + pname = "openwith"; + version = "unstable-2022-10-28"; + + src = fetchFromGitHub { + owner = "jdek"; + repo = "openwith"; + rev = "a8a99ba0d1cabee7cb470994a1e2507385c30b6e"; + hash = "sha256-lysleg3qM2MndXeKjNk+Y9Tkk40urXA2ZdxY5KZNANo="; + }; + + nativeBuildInputs = [ swift ]; + + buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; + + makeFlags = [ "openwith_${arch}" ]; + + installPhase = '' + runHook preInstall + install openwith_${arch} -D $out/bin/openwith + runHook postInstall + ''; + + meta = with lib; { + description = "Utility to specify which application bundle should open specific file extensions"; + homepage = "https://github.com/jdek/openwith"; + license = licenses.unlicense; + maintainers = with maintainers; [ zowoq ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index db8ede6feb..d8fc464802 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -3,14 +3,15 @@ , fetchurl , alsa-topology-conf , alsa-ucm-conf +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; version = "1.2.7.2"; src = fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8="; }; @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; @@ -41,7 +44,8 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; + pkgConfigModules = [ "alsa" "alsa-topology" ]; platforms = platforms.linux; maintainers = with maintainers; [ l-as ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index 0c6a6f6486..cb58ed48bb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-S43KS/qpzxU+Sgkcud4Cyx4yRjaT6SZzLv6R6bg5I2w="; + sha256 = "sha256-PBqq3u8zym+RY6xudJ66ItzDZEJBNvJDtve1GtxcOdQ="; }; buildInputs = with llvmPackages; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix index f0a05437b6..fe056be74a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.8.0"; + version = "2.8.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-Nw86s93v8ahc/yt5sNsGz4LRwzDPtBnIZNno8vpFdsY="; + sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix index b94f4351ff..9a4f375289 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "1.12.0"; + version = "unstable-2022-10-13"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JZKZ7+1OMbBtUA7pAZ41TzeDDyiD0h7yTXJINJ5FjN4="; + rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; + hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; }; NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index ee36ab5744..3ae23aa560 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,32 +1,56 @@ -{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, xz +, pkg-config +, openssl +, dbus +, glib +, udev +, cairo +, pango +, atk +, gdk-pixbuf +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { pname = "firmware-manager"; - version = "0.1.2"; + version = "unstable-2022-12-09"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = version; - sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; + rev = "9be8160346689bd74f95db7897884a91fa48afe3"; + sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; - - depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-3drsOmlmy1xXRWg7WMDNN+iuVmPYf60sDLIdCvu4rEw="; + }; postPatch = '' - sed -i 's|etc|$(prefix)/etc|' Makefile + substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc' ''; - buildPhase = "make prefix='$(out)'"; + nativeBuildInputs = with rustPlatform; [ + rust.cargo + rust.rustc + pkg-config + cargoSetupHook + wrapGAppsHook + ]; - installPhase = "make prefix='$(out)' install"; + buildInputs = [ + openssl + gtk3 + udev + ]; - cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U="; - - doCheck = false; + makeFlags = [ "prefix=$(out)" ]; meta = { description = "Graphical frontend for firmware management"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 2fee060932..20679b3c95 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -283,7 +283,7 @@ let DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = yes; + DRM_VMWGFX_FBCON = whenOlder "6.2" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -431,7 +431,7 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_V2_ACL = yes; + NFSD_V2_ACL = whenOlder "6.2" yes; NFSD_V3 = whenOlder "5.18" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; @@ -457,7 +457,7 @@ let CEPH_FS_POSIX_ACL = yes; SQUASHFS_FILE_DIRECT = yes; - SQUASHFS_DECOMP_MULTI_PERCPU = yes; + SQUASHFS_DECOMP_MULTI_PERCPU = whenOlder "6.2" yes; SQUASHFS_XATTR = yes; SQUASHFS_ZLIB = yes; SQUASHFS_LZO = yes; @@ -502,8 +502,8 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG + RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules @@ -830,7 +830,7 @@ let EFI_STUB = yes; # EFI bootloader in the bzImage itself EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = - whenAtLeast "5.8" yes; # initrd kernel parameter for EFI + whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI CGROUPS = yes; # used by systemd FHANDLE = yes; # used by systemd SECCOMP = yes; # used by systemd >= 231 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index a2cace8bc1..db4c5b76c4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,22 +22,22 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.165-hardened1.patch", - "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch" + "name": "linux-hardened-5.10.166-hardened1.patch", + "sha256": "1ygxald6mq47n7i6x80mv9d5idfpwk6gpcijci8bsazhndwvi7qy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.166-hardened1/linux-hardened-5.10.166-hardened1.patch" }, - "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", - "version": "5.10.165" + "sha256": "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80", + "version": "5.10.166" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.90-hardened1.patch", - "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch" + "name": "linux-hardened-5.15.91-hardened1.patch", + "sha256": "041yigcqzp7m6cibl9h3jgsz20xhxc9y7y5pay9c7fkh2ypy9zgz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.91-hardened1/linux-hardened-5.15.91-hardened1.patch" }, - "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", - "version": "5.15.90" + "sha256": "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56", + "version": "5.15.91" }, "5.4": { "patch": { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 3e5cc00957..06866be49e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.304"; + version = "4.14.305"; # 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 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; + sha256 = "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 506d57d797..11a8c11f3f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.271"; + version = "4.19.272"; # 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 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; + sha256 = "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index b2a9f27947..8843f6622a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.166"; + version = "5.10.167"; # 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 = "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80"; + sha256 = "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 9ae7546f3c..b9e6145bcf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.91"; + version = "5.15.92"; # 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 = "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56"; + sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index aef87aaa42..42c5997f22 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.230"; + version = "5.4.231"; # 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 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; + sha256 = "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix index 2bed730a8b..ff5793009c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.9"; + version = "6.1.10"; # 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 = "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n"; + sha256 = "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 698ca10016..e0290a2aec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19027"; - sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv"; + rev = "19044"; + sha256 = "1xiykp6lwvlz8x48i7f1f3izra2hfz75iihw3y4w5f1jlji6y56m"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 8a6d1a89dc..115d8ad931 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-12-29" -, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37" -, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw=" +, commitDate ? "2023-02-01" +, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f" +, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} @@ -17,7 +17,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak Madouura ]; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; }; } // argsOverride; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 244fced25e..cef442ad20 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2-rc2"; + version = "6.2-rc6"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-QRmOwtoGG2uNCNcAIAltrCT7zaD2V+RNe3bjHGn5+ts="; + hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc="; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 35cb84e077..3610fe38f5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.9"; #zen + version = "6.1.10"; #zen suffix = "zen1"; #zen - sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen + sha256 = "0dfn449v3lzz1clxbsypakd0sfii9iycy1hq9x52fr9xf8wy3cxk"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.9"; #lqx + version = "6.1.10"; #lqx suffix = "lqx1"; #lqx - sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx + sha256 = "1ka94z0wvq90vfzd4ncjrzk5xcb5gvaldaph7mc25jxgh6pal822"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix index 5a58c198c0..56cfb8ef9c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.6"; + version = "3.4.7"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw="; + sha256 = "sha256-uYJhjxarAqJC/aY8UUy7sjhA89LVoCG6B7/APkE0ouk="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix index 43c9bf74e3..683448cbe4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.229"; + version = "11.2.230"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "sha256-t3tZCxGmGMscDmeyCATLbHxU7jEJqAzxwPV0Z8pl2ko="; + sha256 = "sha256-dMfGq067TqstGAWNSZZaZCwvChTyPUsvaPVjFGGzp64="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix index f058e09bbd..c5d8e9cf80 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libzbd"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbd"; rev = "v${version}"; - sha256 = "GoCHwuR4ylyaN/FskIqKyAPe2A2O3iFVcI3UxPlqvtk="; + sha256 = "sha256-iMQjOWsgsS+uI8mqoOXHRAV1+SIu1McUAcrsY+/zcu8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix index 756e135263..3a69923aca 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,41 +1,16 @@ -{ lib, stdenv, fetchgit, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.4"; + version = "2.13.8"; - src = fetchgit { - url = "https://git.lttng.org/lttng-modules.git"; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-J2Tr1vOiCAilmnf3attF3bz8Irn9IQ2QbapdXJ4MUSg="; + hash = "sha256-6ohWsGUGFz7QlHkKWyW5edpSsBTE9DFS3v6EsH9wNZo="; }; - patches = [ - # fix: mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=6229bbaa423832f6b7c7a658ad11e1d4242752ff"; - hash = "sha256-pqbKxBzjfN20wfsqSeBLXNQ+/U+3qk9RfTiT32OwSIc="; - }) - - # fix: fs: Remove flags parameter from aops->write_begin (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=5e2f832d59d51589ab69479c7db43c7581fb9346"; - hash = "sha256-auoCbvFEVR76sOCLjIe+q/Q+vunQlR3G3gVcjqAGGPk="; - }) - - # fix: workqueue: Fix type of cpu in trace event (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=c6da9604b1666780ea4725b3b3d1bfa1548f9c89"; - hash = "sha256-qoTwy+P32qg1L+JctqM1+70OkeTbnbL3QJ9LwaBq/bw="; - }) - - # fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=96c477dabaaf6cd1734bebe0972fef877e5a463b"; - hash = "sha256-b7BhrYZ5SZqeRVGEu0Eo9GfbcZdDPrgEnOl2XU3z+ds="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -57,6 +32,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10"; + broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10" || (lib.versions.majorMinor kernel.modDirVersion) == "5.4"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index 884ccdd6c5..5570228d78 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -25,7 +25,7 @@ let cd src/libXNVCtrl ''; - makeFlags = nvidia_x11.makeFlags ++ [ + makeFlags = [ "OUTPUTDIR=." # src/libXNVCtrl ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; + makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; preBuild = '' if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix index 6700077625..6185bf9912 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "rt-tests"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-yuSfeYTaCZ0F1GXQkDnH8PBvyzR2w/XDitN8csHB9xE="; + sha256 = "sha256-LzN3YB3Lb7tjyEplrFaNYtiGwHUUTztZBsMrUndd2cU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix index 0a385d0ca3..589408a302 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -3,22 +3,15 @@ # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { name = "rtl8189fs-${kernel.version}-${version}"; - version = "2022-05-20"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "71500c28164369800041d1716ac513457179ce93"; - sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/jwrdegoede/rtl8189ES_linux/pull/81.patch"; - sha256 = "sha256-ovFQBIHLk3wi2uwAyr8VmdbuhPcoHsZ/lpA66obVBK4="; - }) - ]; - meta = with lib; { description = "Driver for Realtek rtl8189fs"; homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix index a732d1c5d8..4aa408eec4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8723ds"; - version = "${kernel.version}-unstable-2022-10-20"; + version = "${kernel.version}-unstable-2022-12-01"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtl8723ds"; - rev = "912fdb30531bc8c071267a047e7df16feae7a865"; - sha256 = "sha256-HhoCKrrRg1Q995sekQvzhaiqANeTP8pANItj2vLV+Cw="; + rev = "a638cc8639015b8b9390af3350fab0366b6c87e7"; + sha256 = "sha256-qfVE7k71NPzw3FwoOaUxH66PnDjbpMAF6CyOyUVdSMA="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix index 6a1c4fc80d..84ad6a314e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2022-08-22"; + version = "${kernel.version}-unstable-2023-01-17"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "7aa0e0c74551b4e4f319f4b54e00ccbfe588b7ce"; - sha256 = "sha256-BHC1DpWHv/1UvSfj6S5fo/ODZ1VDgLQO2A9EC+BR1JE="; + rev = "0a8bb3cec3ef91e6ef8cf549ca926016ba0a8acd"; + sha256 = "sha256-25NaMQq9H6mqVynNQJXpqISAslxfEVSt3ELzG7s4mV4="; }; nativeBuildInputs = [ bc nukeReferences ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix index 5e4b764431..dd0b32c538 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8814au"; - version = "${kernel.version}-unstable-2022-08-18"; + version = "${kernel.version}-unstable-2022-11-09"; src = fetchFromGitHub { owner = "morrownr"; repo = "8814au"; - rev = "752d8ea365b2affc5d356e35659600995508849d"; - hash = "sha256-m79IVoD3xFigmax13qELx5e3v0NfJSwmmC0PatA91HI="; + rev = "932df6f7da6c3a384cf91f33eb195097eb0cb6c5"; + hash = "sha256-nMQiT59IIhzpePWWDiyCQFmYLWM42L/mG0BKsbEwreo="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index 0e80a70fd5..674af264c3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,25 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , kernel , bc }: stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2022-06-01"; + version = "${kernel.version}-unstable-2023-01-01"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "be733dc86781c68571650b395dd0fa6b53c0a039"; - sha256 = "sha256-4PgISOjCSSGymz96VwE4jzcUiOEO+Ocuk2kJVIA+TQM="; - }; - - patches = fetchpatch { - url = "https://github.com/tomaspinho/rtl8821ce/pull/291.patch"; - sha256 = "sha256-GCZ/iPtzF7PP0ZgagBev6r7IVQ2VenPoLKL9GnPSt+U="; + rev = "a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6"; + sha256 = "sha256-eR4iTkRMnhNEBrUEC+fKlwq3hezNC9mSAQ7D0Wwss/0="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix index 35a0355c0b..2e554a0241 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; - rev = version; - sha256 = "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5"; + rev = "refs/tags/${version}"; + sha256 = "sha256-4T5FIdnKi35JSm+IoYA2gIBBRV0nN0YLEw9xvDqNcgo="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index f743b00248..e492bc2403 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "kernelshark"; - version = "2.1.1"; + version = "2.2.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"; rev = "kernelshark-v${version}"; - sha256 = "sha256-1M35y3EkMHbGkVv93Xwo4zApvy9usIcz1spm5Z+1iUs="; + sha256 = "sha256-VkUah8qAlOck9245f/zngtVpHmJdx6eQXqwzLwK2xjU="; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index e1ff2e14cf..a1cd2719f8 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.11.7"; + version = "3.11.8"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-m1O/k/w9WLSRpKADo79DU+vf4z41l6nfJpIwpY1dGgA="; + hash = "sha256-sD9E60xXNJQSg98XbMq6xn+nk3uQn1XnrxApAuSaF44="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index 37d6b7251a..2c2f153626 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.6.2"; + version = "2.6.3"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - sha256 = "sha256-EXs+LNb87RWkmSWvs8nZIVqRJMutn+ntR241gqI7CUg="; + sha256 = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0="; + sha256 = "sha256-YH+lo6gKqmhu1/3HZdWXnxTXaUwC8To+OCmGpji6i3k="; }; - vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY="; + vendorSha256 = "sha256-sqjN+NgwdP2qw7/CBxKvSwwA3teg/trXg/oa1Ff0N8s="; subPackages = [ "cmd/caddy" ]; @@ -58,8 +58,8 @@ buildGoModule { meta = with lib; { homepage = "https://caddyserver.com"; - description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne techknowlogick ]; + maintainers = with maintainers; [ Br1ght0ne indeednotjames techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix index 634a6aed14..c20a0e325e 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.3.1"; + version = "0.3.2"; subPackages = [ "cmd/xcaddy" ]; @@ -10,19 +10,26 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-oGTtS5UlEebIqv4SM4q0YclASJNu8DNOLrGLRRAtkd8="; + hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs="; }; patches = [ + ./inject_version_info.diff ./use_tmpdir_on_darwin.diff ]; + ldflags = [ + "-s" + "-w" + "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}" + ]; + vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y="; meta = with lib; { homepage = "https://github.com/caddyserver/xcaddy"; description = "Build Caddy with plugins"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; + maintainers = with maintainers; [ tjni indeednotjames ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/inject_version_info.diff new file mode 100644 index 0000000000..4d87aa6878 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/inject_version_info.diff @@ -0,0 +1,16 @@ +diff --git a/cmd/main.go b/cmd/main.go +index ede7cd8..c553140 100644 +--- a/cmd/main.go ++++ b/cmd/main.go +@@ -401,8 +401,11 @@ func splitWith(arg string) (module, version, replace string, err error) { + return + } + ++var customVersion string ++ + // xcaddyVersion returns a detailed version string, if available. + func xcaddyVersion() string { ++ return customVersion + mod := goModule() + ver := mod.Version + if mod.Sum != "" { diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index 14c4822f3f..0fd0ecd637 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , nixosTests , python3 +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -43,6 +44,12 @@ python3.pkgs.buildPythonApplication rec { # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters # are stored in the DB. ./db-migrations.patch + # Handle version 3.0 of flask-babel + (fetchpatch { + url = "https://github.com/janeczku/calibre-web/commit/94a6931d48d347ae6c07e2b5f0301e8cf97cf53d.patch"; + excludes = [ "requirements.txt" ]; + hash = "sha256-0DQ+LbIOOwjBXQh+b1w8dYQ3s+xZ6nFoH5GvgJdBAFI="; + }) ]; # calibre-web doesn't follow setuptools directory structure. The following is taken from the script @@ -59,6 +66,7 @@ python3.pkgs.buildPythonApplication rec { --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ --replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \ --replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \ + --replace "Flask-Babel>=0.11.1,<2.1.0" "Flask-Babel>=0.11.1" \ --replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \ --replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \ --replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \ diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index 1bee799189..2281031a64 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.7.1"; + version = "22.05.8.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1hr62c9g0z3brgpa2l68pskraqxk52dk1iq1xkb0dr5w0cwhdpij"; + sha256 = "sha256-hL/FnHl+Fj62xGH1FVkB9jVtvrVxbPU73DlMWC6CyJ0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix index 2081f32ea6..3878b554af 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-UkvSuwWqLgWYKpca6FEPKBIwOrRIajhhtiIS0GsRJ80="; + hash = "sha256-fq9vrC8mVlxdhljUKiE3meBfTTvGjnxxbnF030ExWIY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 7e255c01d3..539dbd6a80 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13"; + sha256 = "c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index aee5768930..ed64f6b791 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -90,7 +90,7 @@ unwrapped = stdenv.mkDerivation rec { doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' - meson test --print-errorlogs + meson test --print-errorlogs --no-suite snowflake ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index a41581d934..a449b242da 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "17A0RwCSV+US8B/MRsvbnIWbZyocmyP684LocHZbDw0="; + sha256 = "sha256-Q4LT6E8TQBaFdyd53+3my8gVfs9nY/p/2x3TPuP3msc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/eris-go/default.nix b/third_party/nixpkgs/pkgs/servers/eris-go/default.nix index 3dbc3994e6..1a25e77388 100644 --- a/third_party/nixpkgs/pkgs/servers/eris-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/eris-go/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitea }: +{ lib, stdenv, buildGoModule, fetchFromGitea }: buildGoModule rec { pname = "eris-go"; - version = "20230123"; + version = "20230202"; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; repo = pname; rev = version; - hash = "sha256-jdeh5lhbu2hxVNdnU0GiMsdXRi8004Xgu2/tgFhqPao="; + hash = "sha256-o9FRlUtMk1h8sR+am2gNEQOMgAceRTdRusI4a6ikHUM="; }; - vendorHash = "sha256-mLyPaX5rDw0rR4PXtzpLMOrsYwTH3Y+COcrvwH7/qdo="; + vendorHash = "sha256-ZDJm7ZlDBVWLnuC90pOwa608GnuEgy0N/I96vvesZPY="; postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put"; # eris-get is a multicall binary @@ -22,5 +22,6 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; mainProgram = "eris-get"; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix index 4272332787..ede9f78e8d 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin }: let - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-KQ3N6HBgdLnS/8UprT99gH9ttsy2cgfaWSL/ILX6t1A="; + hash = "sha256-VgWY622RJ8f4yA6TRC5IvatVFw2CP5lN3QBS3Xaevbc="; }; CGO_ENABLED = 0; @@ -25,11 +25,11 @@ let inherit CGO_ENABLED meta src version; - vendorSha256 = "sha256-u4N8YXmnVk5flPimdE4olr/1hVZoEDEgUwXRRTlX51o="; + vendorHash = "sha256-w/aWrQF/PAWTGMFUcpHiiDef6cvLLdYP06iwBdxrGkQ="; modRoot = "./server"; - postBuild = '' + preInstall = '' mv $GOPATH/bin/{server,etcd} ''; @@ -45,7 +45,7 @@ let inherit CGO_ENABLED meta src version; - vendorSha256 = "sha256-J4qW2Dzpwk85XW3oWvT1F5ec/jzkcLbTC+1CMBztWRw="; + vendorHash = "sha256-Bq5vOZCflLDAhhmwSww9JCahfL/JHKa3ZT4cwNXzW90="; modRoot = "./etcdutl"; }; @@ -55,7 +55,7 @@ let inherit CGO_ENABLED meta src version; - vendorSha256 = "sha256-+5zWXVErkFAvtkpNQtKn/jLOGUdHkXgeZWI7/RIMgMQ="; + vendorHash = "sha256-KUr0SrfuE5sh54THdvJwuMO/U6O+civ6onEPzNGqf18="; modRoot = "./etcdctl"; }; diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/mapcache/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/mapcache/default.nix index 3eae9c2b33..781edfce98 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/mapcache/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/mapcache/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mapcache"; - version = "1.12.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-NuiZMWcmsN5wDCd37Hvj3cazwT3Ea+OknV/YR3urZB0="; + sha256 = "sha256-+QP4xXhP+MNqnhMUtMdtKrcuJ0M2BXWu3mbxXzj5ybc="; }; nativeBuildInputs = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { "-DAPACHE_MODULE_DIR=${placeholder "out"}/modules" ]; + NIX_CFLAGS_COMPILE = "-std=c99"; + meta = with lib; { description = "A server that implements tile caching to speed up access to WMS layers"; homepage = "https://mapserver.org/mapcache/"; diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index c8a4b99d58..8ebcde82a4 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-/KT3JZ/xYcKRynksWgsPsioCLTSxeQxr6WjRUzYXJcU="; + hash = "sha256-RqJrqY1Eh5/TY+vMAO5fABmeV5aSzcLD4fX7j1QDN6w="; }; vendorHash = "sha256-8p5NFxXKaZPsW4B6NMzfi0pqfVroIahSgA0fukvB3JI="; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 1d1e2a94ae..8abe197bee 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.2.0"; + version = "2023.2.3"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2970,7 +2970,8 @@ pyqvrpro ]; "qwikswitch" = ps: with ps; [ - ]; # missing inputs: pyqwikswitch + pyqwikswitch + ]; "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -4899,6 +4900,7 @@ "qingping" "qld_bushfire" "qnap_qsw" + "qwikswitch" "rachio" "radarr" "radio_browser" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 83607eb7f9..94ab3ab5b5 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -271,7 +271,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.2.0"; + hassVersion = "2023.2.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -289,9 +289,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tW1tVPJ50DIGIuxJP9nq4+Tw4fiPA+kINSclW7JkJmE="; + hash = "sha256-cRdxlmlgkKTnrtqGQPbSpBLHf+vfI9T6sdETcGshN9M="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + # leave this in, so users don't have to constantly update their downstream patch handling patches = [ (substituteAll { @@ -328,7 +332,7 @@ in python.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python.pkgs; [ - # Only packages required in setup.py + # Only packages required in pyproject.toml aiohttp astral async-timeout @@ -346,6 +350,7 @@ in python.pkgs.buildPythonApplication rec { lru-dict orjson pip + pyopenssl pyjwt python-slugify pyyaml @@ -353,10 +358,8 @@ in python.pkgs.buildPythonApplication rec { voluptuous voluptuous-serialize yarl - # Not in setup.py, but used in homeassistant/util/package.py + # Implicit dependency via homeassistant/requirements.py setuptools - # Not in setup.py, but uncounditionally imported via tests/conftest.py - paho-mqtt ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -369,22 +372,28 @@ in python.pkgs.buildPythonApplication rec { freezegun pytest-asyncio pytest-aiohttp - pytest-freezegun + pytest-freezer pytest-mock pytest-rerunfailures pytest-socket + pytest-timeout pytest-unordered pytest-xdist pytestCheckHook requests-mock respx stdlib-list - # required by tests/auth/mfa_modules + tomli + # required through tests/auth/mfa_modules/test_otp.py pyotp + # Sneakily imported in tests/conftest.py + paho-mqtt ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" "hue" + # for tests/test_config.py::test_merge_id_schema + "qwikswitch" ]; pytestFlagsArray = [ @@ -395,8 +404,8 @@ in python.pkgs.buildPythonApplication rec { "--only-rerun RuntimeError" # enable full variable printing on error "--showlocals" - # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' - "--deselect tests/helpers/test_system_info.py::test_container_installationtype" + # AssertionError: assert 1 == 0 + "--deselect tests/test_config.py::test_merge" # tests are located in tests/ "tests" ]; @@ -408,17 +417,6 @@ in python.pkgs.buildPythonApplication rec { "tests/pylint" # don't bulk test all components "tests/components" - # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 - "tests/auth/mfa_modules/test_notify.py" - ]; - - disabledTests = [ - # AssertionError: assert 1 == 0 - "test_merge" - # Tests are flaky - "test_config_platform_valid" - # Test requires pylint>=2.13.0 - "test_invalid_discovery_info" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 59661f357f..a3b1e7df1a 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230201.0"; + version = "20230202.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-CG4I3YI1swiAV02+NXvi9n87dXrTJFlMUcOnB9ebmWk="; + hash = "sha256-Wo3bQnwTDSAC4EhJeYIXx1wODyx3wA2KMMaM3pJEkGw="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 75b63ec99a..734823e9f4 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -76,8 +76,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; - disabledTests = old.disabledTests ++ extraDisabledTests.${component} or []; - disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; + disabledTests = old.disabledTests or [] ++ extraDisabledTests.${component} or []; + disabledTestPaths = old.disabledTestPaths or [] ++ extraDisabledTestPaths.${component} or [ ]; # components are more often racy than the core dontUsePytestXdist = true; diff --git a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index 88c7c5a3de..7c826efbf4 100644 --- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.111.1"; + version = "0.112.5"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-2ZxEUhDNF2E5http8Pz21L0tw6r4UOK5XYDXbHJDnEU="; + hash = "sha256-UoBepu+9A4nuv9HdjYacMXzXqdS24KU4hYuRlEhsdKQ="; }; - vendorHash = "sha256-+qne/eB+z8e0vStC9V0w7jgWgo3vvkaR42dUe+/eXDE="; + vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-zrNfev2x5quuujifRHUufBK/GnR7QkCypHCyYb4nwkI="; + hash = "sha256-bUdyRrrU+lWGouGHweNHRhHe3/jEb4nSviU1t4AriMU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix index 875744898f..83d482e251 100644 --- a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - hash = "sha256-DxAWSU6nleTRkgtU6cW5KEJ0aQuzom+kGwTOk1Kg8CI="; + hash = "sha256-UMC1puEM0PhIu+lJouOj81tI/E6fz1PzPN0FU7TNwTg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/invidious/versions.json b/third_party/nixpkgs/pkgs/servers/invidious/versions.json index bb6063fdaf..82438bf23f 100644 --- a/third_party/nixpkgs/pkgs/servers/invidious/versions.json +++ b/third_party/nixpkgs/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "3b8e6c6040fe341fe4b9fc16cdbd3aea697dfad3", - "sha256": "sha256-gESGo8zRJtGJZrZEkW0OS/O65ZwVzpDA3jmyLCV0RpI=", - "version": "unstable-2023-01-26" + "rev": "d6dd341594cc837001ed57cbea3103d22c9988c1", + "sha256": "sha256-BHCbIX7Qi2adixIY+hcU8t5kBXBGAv8DTviJ7BPHKCg=", + "version": "unstable-2023-02-02" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index ba6e1cdcc7..ae8b8eacab 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2782"; + version = "0.20.3004"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-qBstaZfBts2EfYVt+iU9QqIEVRfPIqt122NAMlS42yoV7iLqeXfK989Wm6FoYtTvvgtNpVJ9rLPNMSSH3AX3TQ=="; + hash = "sha512-UNGkcCQeeMxonJ9Kf1SDMTgSC8uTM2gD377qA+ViSfpWoOGQCY003EZ0c3c0q6oSGVbiIma1wvyW/T/ILLi5yw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 7c9117f91c..b1d38c4adc 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-01-07"; + version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "f1203d56f6bc2c84d00605a76525be4c13430324"; - sha256 = "sha256-7FJ+omzXpj49AThcv0xDilIekCyehtvpvck1+nrMS70="; + rev = "5644481590a16ac5b3d8c20874f0477d5d51a963"; + sha256 = "sha256-OGFVcUPw0sqTbJyrMvCxp8nER9/42ZRN4zIrpm/qh4E="; }; sourceRoot = "source/klippy"; diff --git a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix index 2a3586f29e..098fdb6e02 100644 --- a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kiiZxS5ttUZ1FdF/N9sO6GO13Wmij8DwsNa8p+ZTk0k="; + hash = "sha256-ZH1mtFfbM+acEY1oyoFXPltgPbtgI1kzoO59op1zZfo="; }; - cargoSha256 = "sha256-0XBJ1tlVO2+iK9O2CDVZxDwFXW8T23j2lSbqpnW3fis="; + cargoHash = "sha256-2DBptAvJ0J65AehgHG7f4JZf1QA4ZXn8dqG09wcXsiU="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix index d74e1a0fab..2a5a0a2308 100644 --- a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix +++ b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix @@ -37,5 +37,9 @@ stdenv.mkDerivation rec { homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; + knownVulnerabilities = [ + "CVE-2022-48008" + "CVE-2022-48010" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix index a5b6cf9228..844eb8dc3d 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "OpenSMTPD filter for DKIM signing"; homepage = "http://imperialat.at/dev/filter-dkimsign/"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix index f740a12e53..e9abdf0864 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Library for creating OpenSMTPD filters"; homepage = "http://imperialat.at/dev/libopensmtpd/"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix b/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix index 521e6dafd8..93b85cee6b 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , installShellFiles , testers , vsmtp @@ -9,30 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "vsmtp"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "viridIT"; repo = "vsmtp"; rev = "v${version}"; - hash = "sha256-uyu2NpHFDqJDcfQukG6TdRH7KuZnrYTULvLiABdvAog="; + hash = "sha256-FI4BvU+83nTzRLJQZ1l1eOn41ZeA62Db+p3d//5o0Wk="; }; - patches = [ - # https://github.com/viridIT/vSMTP/pull/952 - # treewide: set GIT_HASH to unknown if git rev-parse HEAD fails - (fetchpatch { - url = "https://github.com/viridIT/vSMTP/commit/0ac4820c079e459f515825dfb451980119eaae9e.patch"; - includes = [ "src/vsmtp/vsmtp-core/build.rs" "src/vqueue/build.rs" ]; - hash = "sha256-kGjXsVokP6039rksaxw1EM/0zOlKIus1EaIEsFJvLE8="; - }) - ]; - - cargoHash = "sha256-A0Q6ciZJL13VzJgZIWZalrRElSNGHUN/9b8Csj4Tdak="; + cargoHash = "sha256-Qhhh0riM1qeD3/JZINvY0t5fEOj+prI0fyXagdR43sc="; nativeBuildInputs = [ installShellFiles ]; - # too many upstream failures + # tests do not run well in the nix sandbox doCheck = false; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index 01819e8e99..e6eab7da86 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -7,21 +7,21 @@ buildGoModule rec { pname = "mattermost"; - version = "7.5.2"; + version = "7.7.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-Jm7bu/RoFp7h38Ygis3U2E7Hbbj4zmRPc4PacxxASsw="; + sha256 = "sha256-py1Ck/BGNGIlyVZXJPb9bYHLU8FTrBEIQwVkHvgHRLY"; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-Zvzme6Og/LLsT4XyFDAQscNgO+jCwwzDDytYOo4qM0U="; + sha256 = "sha256-4FrvKQdGKfwJM7Oc43kg1Iq4o/OT2/kl89bTKBO4EdQ"; }; - vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk="; + vendorSha256 = "sha256-qJSddirC0VVFgKsttmNFZ1AzGR7jo07jXzrt7+DswXs="; subPackages = [ "cmd/mattermost" ]; diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index d3439b582a..68edff754a 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM="; + hash = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs="; }; vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix index 0529a2bb07..6aefa4f453 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.14.18"; + version = "0.15.0"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-M204aIFbs2VmwgZbOmkpuyqOfpom/FnKc6noEVMuZfs="; + sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM="; }; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix new file mode 100644 index 0000000000..76f2f777f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix @@ -0,0 +1,226 @@ +{ lib +, stdenv +, fetchzip +, fetchurl +, fetchFromGitHub +, autoreconfHook +, bashInteractive +, cacert +, coreutils +, dbus +, docbook_xml_dtd_43 +, docbook_xsl +, findutils +, gettext +, git +, glib +, glibc +, glib-networking +, gnused +, gnutls +, json-glib +, krb5 +, libssh +, libxcrypt +, libxslt +, makeWrapper +, nodejs +, nixosTests +, openssh +, openssl +, pam +, pkg-config +, polkit +, python3Packages +, ripgrep +, runtimeShell +, systemd +, udev +, xmlto +}: + +let + pythonWithGobject = python3Packages.python.withPackages (p: with p; [ + pygobject3 + ]); +in + +stdenv.mkDerivation rec { + pname = "cockpit"; + version = "284"; + + src = fetchFromGitHub { + owner = "cockpit-project"; + repo = "cockpit"; + rev = "80a7c7cfed9157915067666fe95b298896f2aea8"; + sha256 = "sha256-iAIW6nVUk1FJD2dQvDMREPVqrq0JkExJ7lVio//ALts="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + docbook_xml_dtd_43 + docbook_xsl + findutils + gettext + git + (lib.getBin libxslt) + nodejs + openssl + pam + pkg-config + pythonWithGobject.python + python3Packages.setuptools + systemd + ripgrep + xmlto + ]; + + buildInputs = [ + (lib.getDev glib) + libxcrypt + gnutls + json-glib + krb5 + libssh + polkit + udev + ]; + + patches = [ + # Instead of requiring Internet access to do an npm install to generate the package-lock.json + # it copies the package-lock.json already present in the node_modules folder fetched as a git + # submodule. + ./nerf-node-modules.patch + + # sysconfdir is $(prefix)/etc by default and it breaks the configuration file loading feature + # changing sysconfdir to /etc breaks the build in this part of the makefile because it tries + # to write to /etc inside the sandbox + # this patch redirects it to write to $out/etc instead of /etc + ./fix-makefiles.patch + ]; + + postPatch = '' + # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly + substituteInPlace configure.ac \ + --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' + patchShebangs \ + test/common/pixel-tests \ + test/common/run-tests \ + test/common/tap-cdp \ + test/static-code \ + tools/escape-to-c \ + tools/make-compile-commands \ + tools/node-modules \ + tools/termschutz \ + tools/webpack-make + + for f in node_modules/.bin/*; do + patchShebangs $(realpath $f) + done + + export HOME=$(mktemp -d) + + cp node_modules/.package-lock.json package-lock.json + + substituteInPlace src/systemd_ctypes/libsystemd.py \ + --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 + + for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do + # some files substituteInPlace report as missing and it's safe to ignore them + substituteInPlace "$(realpath "$f")" \ + --replace '"/usr/bin/' '"' \ + --replace '"/bin/' '"' || true + done + + substituteInPlace src/common/Makefile-common.am \ + --replace 'TEST_PROGRAM += test-pipe' "" # skip test-pipe because it hangs the build + + substituteInPlace test/pytest/*.py \ + --replace "'bash" "'${bashInteractive}/bin/bash" + + echo "m4_define(VERSION_NUMBER, [${version}])" > version.m4 + ''; + + configureFlags = [ + "--enable-prefix-only=yes" + "--sysconfdir=/etc" + "--disable-pcp" # TODO: figure out how to package its dependency + "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" + ]; + + enableParallelBuilding = true; + + preBuild = '' + patchShebangs \ + tools/test-driver + ''; + + postBuild = '' + find | grep cockpit-bridge + chmod +x \ + src/systemd/update-motd \ + src/tls/cockpit-certificate-helper \ + src/ws/cockpit-desktop + + patchShebangs \ + src/systemd/update-motd \ + src/tls/cockpit-certificate-helper \ + src/ws/cockpit-desktop + + PATH=${pythonWithGobject}/bin patchShebangs src/client/cockpit-client + + substituteInPlace src/ws/cockpit-desktop \ + --replace ' /bin/bash' ' ${runtimeShell}' + ''; + + fixupPhase = '' + runHook preFixup + + wrapProgram $out/libexec/cockpit-certificate-helper \ + --prefix PATH : ${lib.makeBinPath [ coreutils openssl ]} \ + --run 'cd $(mktemp -d)' + + wrapProgram $out/share/cockpit/motd/update-motd \ + --prefix PATH : ${lib.makeBinPath [ gnused ]} + + substituteInPlace $out/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ + --replace /usr $out + + runHook postFixup + ''; + + doCheck = true; + checkInputs = [ + bashInteractive + cacert + dbus + glib-networking + openssh + python3Packages.pytest + python3Packages.vulture + ]; + checkPhase = '' + export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules + export G_DEBUG=fatal-criticals + export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge + export PATH=$PATH:$(pwd) + + cockpit-bridge --version + make pytest -j$NIX_BUILD_CORES || true + make check -j$NIX_BUILD_CORES || true + test/static-code + npm run eslint + npm run stylelint + ''; + + passthru.tests = { inherit (nixosTests) cockpit; }; + + meta = with lib; { + description = "Web-based graphical interface for servers"; + homepage = "https://cockpit-project.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/fix-makefiles.patch b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/fix-makefiles.patch new file mode 100644 index 0000000000..a22eb9f00e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/fix-makefiles.patch @@ -0,0 +1,34 @@ +diff --git a/src/systemd/Makefile.am b/src/systemd/Makefile.am +index f28ea41df..684b82006 100644 +--- a/src/systemd/Makefile.am ++++ b/src/systemd/Makefile.am +@@ -23,10 +23,10 @@ dist_motd_SCRIPTS = src/systemd/update-motd + + # Automake: 'Variables using ... ‘sysconf’ ... are installed by install-exec.' + install-exec-hook:: +- mkdir -p $(DESTDIR)$(sysconfdir)/motd.d +- ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/motd.d/cockpit +- mkdir -p $(DESTDIR)$(sysconfdir)/issue.d +- ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/issue.d/cockpit.issue ++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/motd.d ++ ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/motd.d/cockpit ++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/issue.d ++ ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/issue.d/cockpit.issue + + tempconfdir = $(prefix)/lib/tmpfiles.d + nodist_tempconf_DATA = src/systemd/cockpit-tempfiles.conf +diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am +index ed4e4363e..77a35b0e5 100644 +--- a/src/ws/Makefile-ws.am ++++ b/src/ws/Makefile-ws.am +@@ -169,8 +169,8 @@ install-tests:: + $(INSTALL_DATA) mock-pam-conv-mod.so $(DESTDIR)$(pamdir)/ + + install-exec-hook:: +- mkdir -p $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d +- chmod 755 $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d ++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d ++ chmod 755 $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d + + dist_check_DATA += \ + src/ws/mock-combined.crt \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch new file mode 100644 index 0000000000..36b0e3861a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch @@ -0,0 +1,12 @@ +diff --git a/tools/node-modules b/tools/node-modules +index 518875d..72b51e0 100755 +--- a/tools/node-modules ++++ b/tools/node-modules +@@ -7,6 +7,7 @@ V="${V-0}" # default to friendly messages + + set -eu + cd "${0%/*}/.." ++exit 0 + . tools/git-utils.sh + + cmd_remove() { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index 70ac2f3ab9..812bd159a5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.74.1"; + version = "0.75.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1CywtgvVORkDewFB9iz99aUT5gFi5vXWddGZGLFu7o="; + sha256 = "sha256-XwyBHCx3MngLItgCZfil5k/h6DfQTO+0LN3brldceXI="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-281Qz57n5qAOoqLofTFv5UcLs0xVz8iyV9yxDdsuljE="; + vendorHash = "sha256-cSWyNGR1J2kk4XcaJXFEsMGx5OtyKyBoxY2FCa62x9c="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix index 52f4ab6e2f..9858cdd818 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-lyF7ugnNEJug1Vx24ISrtENk6RoIt7H1zaCPYUZbBmM="; + sha256 = "sha256-MOuLXtjmk9wjQMF2ez3NQ7YTKJtX/RItKbgfaANXzhU="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 783c4e1b72..f4b96b1cf7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.1"; + version = "0.11.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-fn/lMzrlodtCxzMMKwFyQts3PucSPHuIBva5eWsqM8s="; + hash = "sha256-UIB6/0rYOrS/B7CFffg0lPaAhSbmk0KSEogjCundXAU="; }; - vendorHash = "sha256-cj2EG674+tv3eIEv+4amLhwoQwzpke8W+b8E0Tq5d2g="; + vendorHash = "sha256-ueE1eE0cxr7+APvIEzR26Uprx0CXN1jfNLzGVgDmJQk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nut-exporter.nix index d05afd2205..ce859d669c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-imO++i4bfxQnMNh+BOZRYvJAzqgehFIElpQX3NyQF+8="; + sha256 = "sha256-I44unG7eKBGxjm2HnCcm1ThlrDpDglXBork7meOOGiw="; }; vendorHash = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 9538872fb2..be3b102bfb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.25.0"; + version = "1.25.1"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-p+2nsJT3WHYmJ1toIwFi/a/I0//OaUoJIHmQcFHHJ/A="; + sha256 = "sha256-r+kbF4TajBkZyp0B6Tb/Y1Nm7e2zQctDYEmyn0qTqW0="; }; - vendorSha256 = "sha256-xNio3bMFopMgDwdQdtFmkp3F0iWYHVqu9T42S5KNMU8="; + vendorHash = "sha256-AlmmWjwhC5xStcwo+NW0IwC+FteL4Ttwo717VgE8IHM="; proxyVendor = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 969292d670..5184d2c640 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.30.1"; + version = "0.30.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-fCH1smkgqDqs6N3ibBob5R1wsltwC3HV1elI37nfq0g="; + sha256 = "sha256-3IkqaWMQGJssxsAF+BZphEpufR4G5E5bYJvioSO2hJ4="; }; - vendorHash = "sha256-OEOlyExgJoEUY2qygBbrxKRkh26sXDX/gAKReeA6Du4="; + vendorHash = "sha256-JtjVdr23wI5ZM5LlFApWurTTzLkLI4nzA9/bWoOrGSM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix index b52015e1c3..4c34f27191 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC -, snmpSupport ? true, net-snmp +, snmpSupport ? stdenv.buildPlatform == stdenv.hostPlatform, net-snmp , sshSupport ? true, libssh2 , sqliteSupport ? false, sqlite , mysqlSupport ? false, libmysqlclient @@ -60,6 +60,11 @@ in find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; + makeFlags = [ + "AR:=$(AR)" + "RANLIB:=$(RANLIB)" + ]; + postInstall = '' mkdir -p $out/share/zabbix/database/ '' + optionalString sqliteSupport '' diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index db2a6da7e5..1ca26d9f03 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.11"; + version = "2.9.12"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-iYiQYGwvxW7GF32h+E1vg3x6sml7zGk40jbY8akmOnM="; + hash = "sha256-IhzbtTH8Vr+Z1Z9Xzz/CbmxDaR6ygdebEqz2ELa4N3E="; }; - vendorHash = "sha256-qApohNp//N/eBljpa+D2fR19rqw8Bd8wdmME9fzqDxc="; + vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 29edb77fab..391644379e 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -2,18 +2,17 @@ let generic = { - version, hash, + version, sha256, eol ? false, extraVulnerabilities ? [] }: let major = lib.versions.major version; - prerelease = builtins.length (lib.versions.splitVersion version) > 3; in stdenv.mkDerivation rec { pname = "nextcloud"; inherit version; src = fetchurl { - url = "https://download.nextcloud.com/server/${if prerelease then "prereleases" else "release"}/${pname}-${version}.tar.bz2"; - inherit hash; + url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; + inherit sha256; }; patches = [ (./patches + "/v${major}/0001-Setup-remove-custom-dbuser-creation-behavior.patch") ]; @@ -52,19 +51,14 @@ in { nextcloud24 = generic { version = "24.0.9"; - hash = "sha256-WAozhMnAmu+46bQVU9IabiAAF5lUnb0lsx3qIR2X3R4="; + sha256 = "580a3384c9c09aefb8e9b41553d21a6e20001799549dbd25b31dea211d97dd1e"; }; nextcloud25 = generic { version = "25.0.3"; - hash = "sha256-SysUI3Nu+SRpCW/iT2HCTK2Ho04HwceoGzhdPqJcAOw="; + sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; }; - nextcloud26 = generic { - version = "26.0.0beta1"; - hash = "sha256-EfSfn0KjQzciHa3VcrDhGC/aZUw/KDjihXs+qVIcYX0="; - }; - - # tip: get hash with: - # nix hash to-sri --type sha256 $(curl https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256 | cut -d' ' -f1) + # tip: get the sha with: + # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json index 7b45c83af8..0b775a81e8 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1996f97w74slmh7ihv8p1lxl32rri5nnzp90mbb1imclpgac2i63", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.4/contacts-v4.2.4.tar.gz", - "version": "4.2.4", + "sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz", + "version": "4.2.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -110,9 +110,9 @@ ] }, "news": { - "sha256": "0iz1yrl7h60yhc1d1gkalkzc5vlj8sq6lff0ggns6a6qpsdpn9c5", - "url": "https://github.com/nextcloud/news/releases/download/20.0.1/news.tar.gz", - "version": "20.0.1", + "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", + "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", + "version": "20.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -140,9 +140,9 @@ ] }, "polls": { - "sha256": "0qdm0hnljkv0df1s929awyjj1gsp3d6xv9llr52cxv66kkfx086y", - "url": "https://github.com/nextcloud/polls/releases/download/v3.8.4/polls.tar.gz", - "version": "3.8.4", + "sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11", + "url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz", + "version": "3.8.3", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -160,9 +160,9 @@ ] }, "spreed": { - "sha256": "0c5b46g5vi8fsjcd2r0wqza7iqyvbgznwww5zcyajf29a32950c6", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.8/spreed-v14.0.8.tar.gz", - "version": "14.0.8", + "sha256": "0frilxny4mvp34fxw0k8al3r5apy3q6vq7z35jkph3vaq1889m9k", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.7/spreed-v14.0.7.tar.gz", + "version": "14.0.7", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json index e6051ccb13..98ab7ebe3e 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "0yqpfp5nbzd7zar2rbcx3bhfgjxrp1sy6a57fdagndfi4y0r56hq", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.2/calendar-v4.2.2.tar.gz", - "version": "4.2.2", + "sha256": "04g1xm3q46j7harxr0n56r7kkkqjxvah7xijddyq5fj7icr6qf5d", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.1/calendar-v4.2.1.tar.gz", + "version": "4.2.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "181lycyz4v7v1yir6ylmblgha625sn23nf3661g3izq1whi0wgr9", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.3/contacts-v5.0.3.tar.gz", - "version": "5.0.3", + "sha256": "097a71if6kkc7nphfc8b6llqlsskjwp1vg83134hzgfscvllvaj8", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.2/contacts-v5.0.2.tar.gz", + "version": "5.0.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -90,9 +90,9 @@ ] }, "news": { - "sha256": "0iz1yrl7h60yhc1d1gkalkzc5vlj8sq6lff0ggns6a6qpsdpn9c5", - "url": "https://github.com/nextcloud/news/releases/download/20.0.1/news.tar.gz", - "version": "20.0.1", + "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", + "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", + "version": "20.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -120,9 +120,9 @@ ] }, "polls": { - "sha256": "0mqc9zmxrm98byy6v13si3hwii8hx85998c4kv91vk6ad0sfxjhb", - "url": "https://github.com/nextcloud/polls/releases/download/v4.1.2/polls.tar.gz", - "version": "4.1.2", + "sha256": "1amywiw91acp4g90wazmqmnw51s7z6rf27bdrzxrcqryd8igsniq", + "url": "https://github.com/nextcloud/polls/releases/download/v4.1.0-beta4/polls.tar.gz", + "version": "4.1.0-beta4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -140,9 +140,9 @@ ] }, "spreed": { - "sha256": "07nh7nlz8di69ms1156fklj29526i3phlvki5vf2mxnlcz8ihg27", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.3/spreed-v15.0.3.tar.gz", - "version": "15.0.3", + "sha256": "1w5v866lkd0skv666vhz75zwalr2w83shrhdvv354kill9k53awh", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.2/spreed-v15.0.2.tar.gz", + "version": "15.0.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json deleted file mode 100644 index e3a075c7c8..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "calendar": { - "sha256": "0yqpfp5nbzd7zar2rbcx3bhfgjxrp1sy6a57fdagndfi4y0r56hq", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.2/calendar-v4.2.2.tar.gz", - "version": "4.2.2", - "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", - "homepage": "https://github.com/nextcloud/calendar/", - "licenses": [ - "agpl" - ] - }, - "files_texteditor": { - "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", - "version": "2.15.0", - "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", - "homepage": "https://github.com/nextcloud/files_texteditor", - "licenses": [ - "agpl" - ] - }, - "mail": { - "sha256": "", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.2/mail-v2.2.2.tar.gz", - "version": "2.2.2", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", - "homepage": "https://github.com/nextcloud/mail#readme", - "licenses": [ - "agpl" - ] - }, - "notes": { - "sha256": "1jcgv3awr45jq3n3qv851qlpbdl2plixba0iq2s54dmhciypdckl", - "url": "https://github.com/nextcloud/notes/releases/download/v4.6.0/notes.tar.gz", - "version": "4.6.0", - "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", - "homepage": "https://github.com/nextcloud/notes", - "licenses": [ - "agpl" - ] - }, - "tasks": { - "sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz", - "version": "0.14.5", - "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", - "homepage": "https://github.com/nextcloud/tasks/", - "licenses": [ - "agpl" - ] - }, - "unsplash": { - "sha256": "17qqn6kwpvkq21c92jyy3pfvjaj5xms1hr07fnn39zxg0nmwjdd8", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.1.1/unsplash.tar.gz", - "version": "2.1.1", - "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", - "homepage": "https://github.com/nextcloud/unsplash/", - "licenses": [ - "agpl" - ] - } -} diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch deleted file mode 100644 index 28af5ec765..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ /dev/null @@ -1,149 +0,0 @@ -From fc3e14155b3c4300b691ab46579830e725457a54 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 10 Sep 2022 15:18:05 +0200 -Subject: [PATCH] Setup: remove custom dbuser creation behavior - -Both PostgreSQL and MySQL can be authenticated against from Nextcloud by -supplying a database password. Now, during setup the following things -happen: - -* When using postgres and the db user has elevated permissions, a new - unprivileged db user is created and the settings `dbuser`/`dbpass` are - altered in `config.php`. - -* When using MySQL, the password is **always** regenerated since - 24.0.5/23.0.9[1]. - -I consider both cases problematic: the reason why people do configuration -management is to have it as single source of truth! So, IMHO any -application that silently alters config and thus causes deployed -nodes to diverge from the configuration is harmful for that. - -I guess it was sheer luck that it worked for so long in NixOS because -nobody has apparently used password authentication with a privileged -user to operate Nextcloud (which is a good thing in fact). - -[1] https://github.com/nextcloud/server/pull/33513 ---- - lib/private/Setup/MySQL.php | 53 -------------------------------- - lib/private/Setup/PostgreSQL.php | 37 ---------------------- - 2 files changed, 90 deletions(-) - -diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index e3004c269bc..bc958e84e44 100644 ---- a/lib/private/Setup/MySQL.php -+++ b/lib/private/Setup/MySQL.php -@@ -141,62 +141,6 @@ - $rootUser = $this->dbUser; - $rootPassword = $this->dbPassword; - -- //create a random password so we don't need to store the admin password in the config file -- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS); -- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols) -- . $this->random->generate(2, ISecureRandom::CHAR_UPPER) -- . $this->random->generate(2, ISecureRandom::CHAR_LOWER) -- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS) -- . $this->random->generate(2, $saveSymbols) -- ; -- $this->dbPassword = str_shuffle($password); -- -- try { -- //user already specified in config -- $oldUser = $this->config->getValue('dbuser', false); -- -- //we don't have a dbuser specified in config -- if ($this->dbUser !== $oldUser) { -- //add prefix to the admin username to prevent collisions -- $adminUser = substr('oc_' . $username, 0, 16); -- -- $i = 1; -- while (true) { -- //this should be enough to check for admin rights in mysql -- $query = 'SELECT user FROM mysql.user WHERE user=?'; -- $result = $connection->executeQuery($query, [$adminUser]); -- -- //current dbuser has admin rights -- $data = $result->fetchAll(); -- $result->closeCursor(); -- //new dbuser does not exist -- if (count($data) === 0) { -- //use the admin login data for the new database user -- $this->dbUser = $adminUser; -- $this->createDBUser($connection); -- -- break; -- } else { -- //repeat with different username -- $length = strlen((string)$i); -- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i; -- $i++; -- } -- } -- } else { -- // Reuse existing password if a database config is already present -- $this->dbPassword = $rootPassword; -- } -- } catch (\Exception $ex) { -- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ -- 'exception' => $ex, -- 'app' => 'mysql.setup', -- ]); -- // Restore the original credentials -- $this->dbUser = $rootUser; -- $this->dbPassword = $rootPassword; -- } -- - $this->config->setValues([ - 'dbuser' => $this->dbUser, - 'dbpassword' => $this->dbPassword, -diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php -index af816c7ad04..e49e5508e15 100644 ---- a/lib/private/Setup/PostgreSQL.php -+++ b/lib/private/Setup/PostgreSQL.php -@@ -45,43 +45,6 @@ class PostgreSQL extends AbstractDatabase { - $connection = $this->connect([ - 'dbname' => 'postgres' - ]); -- //check for roles creation rights in postgresql -- $builder = $connection->getQueryBuilder(); -- $builder->automaticTablePrefix(false); -- $query = $builder -- ->select('rolname') -- ->from('pg_roles') -- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE'))) -- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser))); -- -- try { -- $result = $query->execute(); -- $canCreateRoles = $result->rowCount() > 0; -- } catch (DatabaseException $e) { -- $canCreateRoles = false; -- } -- -- if ($canCreateRoles) { -- $connectionMainDatabase = $this->connect(); -- //use the admin login data for the new database user -- -- //add prefix to the postgresql user name to prevent collisions -- $this->dbUser = 'oc_' . strtolower($username); -- //create a new password so we don't need to store the admin config in the config file -- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC); -- -- $this->createDBUser($connection); -- -- // Go to the main database and grant create on the public schema -- // The code below is implemented to make installing possible with PostgreSQL version 15: -- // https://www.postgresql.org/docs/release/15.0/ -- // From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases -- // Therefore we assume that the database is only used by one user/service which is Nextcloud -- // Additional services should get installed in a separate database in order to stay secure -- // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS -- $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO ' . addslashes($this->dbUser)); -- $connectionMainDatabase->close(); -- } - - $this->config->setValues([ - 'dbuser' => $this->dbUser, --- -2.38.1 - diff --git a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix index e6e7130e3f..47ca62c6d0 100644 --- a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep +, esbuild, nodejs-16_x, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x-openssl_1_1; + nodejs = nodejs-16_x; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; @@ -40,19 +40,19 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.73.1"; + version = "1.75.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "DZWAzNRRRZ/eElwRGvSK7TxstKK6X1Tj+uAxD4SOScQ="; + sha256 = "ZR4gEE+bLVjcGxhoRYQqfxDjk0ulPmdb5IV041qf954="; }; yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - nativeBuildInputs = [ cacert yarn git ]; + nativeBuildInputs = [ cacert yarn' git ]; buildPhase = '' export HOME=$PWD @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-7UBXigQj7c+fuHPIM5BbRe02DuL+cs6VbQ/D84Yk8i4="; + outputHash = "sha256-KcGhHFglBJDyircYUxpsMLRtQblYx3u/BMQq35A0qhE="; }; nativeBuildInputs = [ @@ -142,6 +142,8 @@ in stdenv.mkDerivation rec { jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json popd '' + '' + export NODE_OPTIONS=--openssl-legacy-provider + # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts diff --git a/third_party/nixpkgs/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch b/third_party/nixpkgs/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch new file mode 100644 index 0000000000..07b224b1f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch @@ -0,0 +1,26 @@ +From 8af53101fbeb0d4855ffa2b33069e833abf2e825 Mon Sep 17 00:00:00 2001 +From: Finn Behrens +Date: Tue, 7 Dec 2021 09:18:53 +0100 +Subject: [PATCH] move result into with guard + +--- + lib/pleroma/web/activity_pub/publisher.ex | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex +index 4f29a44..849b359 100644 +--- a/lib/pleroma/web/activity_pub/publisher.ex ++++ b/lib/pleroma/web/activity_pub/publisher.ex +@@ -63,8 +63,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa + date: date + }) + +- with {:ok, %{status: code}} when code in 200..299 <- +- result = ++ with {:ok, %{status: code}} = result when code in 200..299 <- + HTTP.post( + inbox, + json, +-- +2.34.0 + diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index 357da52928..a17e2ecd3c 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ptp01SnVqQ+qFxX4Qsoyw9bkw+inm9gMSRqtmAcFlVE="; + sha256 = "sha256-PnbsWzuUxGhAGadKfcEWl2HzTA3L4qu3xGJWMx9N4rs="; }; vendorHash = "sha256-8NBudXcU3cjSbo6qpGZVLtbrLedzwijwrbiTgC+OMcU="; diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index 6dde194f92..31b342d833 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -16,17 +16,17 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-0JeZaHaAJ0Z+wcEPGA8yidiKsU/lxEgC6BGpFEzjO0A="; - arm64-linux_hash = "sha256-/N8SY0JS3yX2MARb7MN68CWEZQ8mIXM5zmg96r8hVsw="; - x64-osx_hash = "sha256-kcD6ATOGYJULk6g+v4uISDtnzr0c1y2BntIt3MWUR0Q="; + x64-linux_hash = "sha256-hKvme3saa3/GT0l6OlFjYI0RPClo5rWtVYFN/YuJSaw="; + arm64-linux_hash = "sha256-f7YIJRk1AhlfepmsQqlDFMA97QnbAAzrUtPFfbuV+QY="; + x64-osx_hash = "sha256-7nU12Y7f+fwjziUm6O+xO78IZf8EOfgmz+JibAP/xk8="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "1.1.2.2453"; + version = "1.1.3.2521"; src = fetchurl { - url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; + url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; sha256 = hash; }; diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/update.sh b/third_party/nixpkgs/pkgs/servers/prowlarr/update.sh index d61edda5a0..2d21f72440 100755 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/update.sh +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/update.sh @@ -13,7 +13,7 @@ updateHash() hashKey="${arch}-${os}_hash" - url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz" + url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.master.$version.$os-core-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) sriHash="$(nix hash to-sri --type sha256 $hash)" diff --git a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix index 8cc792f145..c4987cdd28 100644 --- a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub{ owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EKW/Cik4La66bI7EVbFnhivk1o0nIudJdBW7F5dbQaI="; + sha256 = "sha256-tx2ipgvYDdCwcWFeZ/qgGXyKe+kHLuOgDAz/8vf2zEs="; }; - cargoSha256 = "sha256-zIrvBHPthPAzReojmBLb0odDQGcGwZS10rP15qb/zgs="; + cargoHash = "sha256-/zji2sFaOweBo666LqfNRpO/0vi1eAGgOReeuvQIaEQ="; # Some tests need network checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix index 531a2e31a4..a0a6eb72e7 100644 --- a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.7.2"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Zzqqh/3ijOTVVm5ksmsHY4LOL034VXHeZ7XsEg8cxY0="; + sha256 = "sha256-1gGvdc6TJrkFIrN+TUL/7EejApgpgAQxnQbp8RMknHQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index df235abe98..3f657bbece 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -48,11 +48,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.17.4"; + version = "4.17.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-wFEgedtMrHB8zqTBiuu9ay6zrPbpBzXn9kWjJr4fRTc="; + hash = "sha256-67eIDUdP/AnXO1/He8vWV/YjWRAzczGpwk1/acoRRCs="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix b/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix new file mode 100644 index 0000000000..db20f0e920 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchFromGitHub +, python3Packages +, qt6 +}: + +python3Packages.buildPythonApplication rec { + pname = "khoj"; + version = "0.2.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "debanjum"; + repo = "khoj"; + rev = version; + hash = "sha256-cylZNRyHMFJiBjlEtKMpRjRjwQyb7pgOjMtxFhKFU4k="; + }; + + propagatedBuildInputs = with python3Packages; [ + aiofiles + dateparser + defusedxml + fastapi + huggingface-hub + jinja2 + numpy + openai + pillow + pydantic + pyqt6 + pyyaml + schedule + sentence-transformers + torch + torchvision + transformers + uvicorn + ]; + + buildInputs = with qt6; [ + qtwayland + ]; + + nativeBuildInputs = with qt6; [ + wrapQtAppsHook + ]; + + checkInputs = with python3Packages; [ + pytest + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "aiofiles == 0.8.0" "aiofiles >= 0.8.0" \ + --replace "openai == 0.20.0" "openai >= 0.20.0" \ + --replace "pytest == 7.1.2" "pytest >= 7.1.2" \ + --replace "fastapi == 0.77.1" "fastapi >= 0.77.1" \ + --replace "numpy == 1.22.4" "numpy >= 1.22.4" \ + --replace "huggingface_hub == 0.8.1" "huggingface_hub >= 0.8.1" \ + --replace "dateparser == 1.1.1" "dateparser >= 1.1.1" \ + --replace "sentence-transformers == 2.1.0" "sentence-transformers >= 2.1.0" \ + --replace "transformers == 4.21.0" "transformers >= 4.21.0" \ + --replace "torchvision == 0.14.1" "torchvision" \ + --replace "pydantic == 1.9.1" "pydantic >= 1.9.1" \ + --replace "pyqt6 == 6.3.1" "pyqt6 >= 6.3.1" \ + --replace "uvicorn == 0.17.6" "uvicorn >= 0.17.6" + ''; + + meta = with lib; { + description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; + homepage = "https://github.com/debanjum/khoj"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix index c6878df1e0..3b568df12b 100644 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nixosTests }: -let version = "0.30.5"; +let version = "1.0.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "v${version}"; - hash = "sha256-DvMMBF5Z2VdV3ObuD/gquZeimglyzFFVzgUq+/ra+Hc="; + hash = "sha256-XWPJldWxe8iply7XtmDem1gfbNuuaWuFdMfuCbcU6tc="; }; - cargoHash = "sha256-vA3DhGc0EuSdUeXYyG5iuuy7yK+22xPJjI67+/ctUFA="; + cargoHash = "sha256-v8P4pbTJ/t9TgB07tyhn3y8q65xILFTbBgziw5kuxUQ="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix index a55967920f..915575db65 100644 --- a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-cSA7ndpIV3VvIZTBa9NCIlJn57EtT1qxrB0UsMENUS0="; + hash = "sha256-gB3r7Q4M4pXHB9cfCRU8hMccWaJ170es0CJfbo/7lsg="; }; - vendorHash = "sha256-C45KA+9tdj+fR3DUBLdG2dGzT59zuAJczpKVoiAZ7lg="; + vendorHash = "sha256-og3mn0iYl6aubcSAUohqG4ZSqdBB4AQYZtpKfbp7kcQ="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/sharing/default.nix b/third_party/nixpkgs/pkgs/servers/sharing/default.nix new file mode 100644 index 0000000000..dd5df06ad4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sharing/default.nix @@ -0,0 +1,32 @@ +{ buildNpmPackage +, fetchFromGitHub +, lib +}: + +buildNpmPackage rec { + pname = "sharing"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "parvardegr"; + repo = pname; + rev = "v${version}"; + hash = "sha256-y5tAbyRGxr6lagU/+pLBN0VIpk3+SzKyXOehQk6NW+M="; + }; + + npmDepsHash = "sha256-2DwFkkoODDuLOxF63F1ywoXzjcMn/+H2ycRWlJlNcCI="; + + dontNpmBuild = true; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + meta = with lib; { + description = "Command-line tool to share directories and files to mobile devices"; + homepage = "https://github.com/parvardegr/sharing"; + license = licenses.mit; + maintainers = with maintainers; [ ChaosAttractor ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix index fb34b3c5af..b43d31a33f 100644 --- a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix @@ -88,12 +88,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-66kwEN42LjTh/oEdFeOyXP2fU88tjR1K5ZWQJkKcDLQ="; + sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw="; }; postPatch = '' @@ -153,5 +153,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ misuzu ]; platforms = with lib.platforms; unix; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index eb83103976..dd08098b8a 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.25.0"; + version = "2.25.3"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ="; + sha256 = "sha256-FK0F1STRdE1Ny+l0ILQMofXSXDhyzoMgZCT+MuCSmcA="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix index d29453556b..0ca7e2e769 100644 --- a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix +++ b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-MziobrOqEUsg/XhzLChNker3OU9YAH0LmQ+i+UYoPkE="; + sha256 = "sha256-vNcM/eFz+vSEnJTgnvn7Cfx7ZDiXY9RlgU3zQlqYnss="; }; - vendorSha256 = "sha256-YmAPZtGq2wWqrmTwFOPvSZ3pXa3hUFd+TQfU+Nzhlvs="; + vendorHash = "sha256-DZlzgoQ8F3L4hErKnBD14R49pHPJy1/Ut5k004qZzUw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index 9eacea78a3..fe3e3fba8d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -45,7 +45,7 @@ let ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) - ++ (if (lib.versionOlder version "10.6") + ++ (if (lib.versionOlder version "10.5") then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] else [ openssl curl ]); @@ -274,4 +274,11 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; + mariadb_1010 = self.callPackage generic { + # Supported until 2023-11 + version = "10.10.2"; + hash = "sha256-V8vQESsitZL2V81OuC4vNq2QE1Exe/jheElXjoA/PLI="; + inherit (self.darwin) cctools; + inherit (self.darwin.apple_sdk.frameworks) CoreServices; + }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix index a292f69162..cd91f2ef63 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchurl, cmake, python3 -, bison, openssl, readline, bzip2 -}: +{ lib, stdenv, fetchurl, cmake, python3, bison, openssl, readline, bzip2 }: stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.45.11"; + version = "11.45.13"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-0Hme9ohyRuiN9CAZq7SAWGcQxNakiDVWEoL+wt1GsfY="; + sha256 = "sha256-TYTzC1oiU/YwrJNABwyA50qSB12cwrMurqYFVCtSAcc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix index 758794ba87..6eca03c194 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "11.2.2"; + version = "12.2.0"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-MLB2R5ATVBewGaCle8NYPR1mZt2U3CCvEwf2dkBfNTI="; + sha256 = "sha256-Z0z9cDAF7TZ8IJr3Uh2xU0nK2+aNgerk5hO1kY+/wfY="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix index f6f40bcd69..ff277e0680 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - sha256 = "sha256-Szebu6jheBKKHO5KW9GuEW3ts9phIbcowY8PVMiB8yg="; + sha256 = "sha256-Pmx4jnDwZyx7OMiKbKdvMfN4axJWiZgMwGOrdSylgjQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 7c9e8fa695..8015b3a2c3 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.2"; + version = "2.9.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-3n3nqAVow8nIocXPsgCZcNkV+jr/G5/CmnSUfj2WMWo="; + sha256 = "sha256-eUn/sk2l/2aEGXupRPNDrbrIpUA3aNPo3tBJhmBoeXk="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix index a2d48d388c..3f995c0e62 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "proxysql"; - version = "2.4.5"; + version = "2.5.0"; src = fetchFromGitHub { owner = "sysown"; repo = pname; rev = version; - hash = "sha256-JWrll6VF0Ss1DlPNrh+xd3sGMclMeb6dlVgHd/UaNs0="; + hash = "sha256-psQzKycavS9xr24wGiRkr255IXW79AoG9fUEBkvPMZk="; }; patches = [ @@ -68,10 +68,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # otherwise, it looks for …-1.15 - ACLOCAL = "aclocal"; - AUTOMAKE = "automake"; - GIT_VERSION = version; dontConfigure = true; @@ -140,6 +136,18 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config + pushd libmicrohttpd/libmicrohttpd + autoreconf + popd + + pushd libconfig/libconfig + autoreconf + popd + + pushd libdaemon/libdaemon + autoreconf + popd + popd patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch b/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch index a5c4d7f80c..05f8834c95 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index fba4e6a1..ceff4f3d 100644 +index e7dae058..09c28859 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,7 @@ endif @@ -15,7 +15,7 @@ index fba4e6a1..ceff4f3d 100644 USERCHECK := $(shell getent passwd proxysql) GROUPCHECK := $(shell getent group proxysql) -@@ -724,16 +720,10 @@ cleanbuild: +@@ -784,16 +780,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -36,20 +36,21 @@ index fba4e6a1..ceff4f3d 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 13eed9c5..9abb2262 100644 +index 23ef204c..3fbcc4a7 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -65,18 +65,11 @@ endif +@@ -65,10 +65,7 @@ endif libinjection/libinjection/src/libinjection.a: - cd libinjection && rm -rf libinjection-*/ || true - cd libinjection && tar -zxf libinjection-3.10.0.tar.gz --ifneq ($(CENTOSVER),6) + ifneq ($(CENTOSVER),6) - cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff --endif - sed -i 's/CC=/CC?=/' libinjection/libinjection/src/Makefile - cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} + cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch + endif + ifeq ($(UNAME_S),Darwin) +@@ -80,8 +77,6 @@ endif libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: @@ -58,16 +59,25 @@ index 13eed9c5..9abb2262 100644 cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests -@@ -93,8 +86,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) +@@ -99,9 +94,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS))) endif libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a - cd libhttpserver && rm -rf libhttpserver-*/ || true - cd libhttpserver && tar -zxf libhttpserver-0.18.1.tar.gz - ifeq ($(REQUIRE_PATCH), true) +-#ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch -@@ -117,34 +108,16 @@ endif + cd libhttpserver/libhttpserver && patch src/httpserver/deferred_response.hpp < ../deferred_response.hpp.patch +@@ -112,7 +104,6 @@ libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmi + cd libhttpserver/libhttpserver && patch src/httpserver/http_response.hpp < ../http_response.hpp.patch + cd libhttpserver/libhttpserver && patch src/httpserver/string_response.hpp < ../string_response.hpp.patch + cd libhttpserver/libhttpserver && patch -p0 < ../re2_regex.patch +-#endif + cd libhttpserver/libhttpserver && patch -p0 < ../final_val_post_process.patch + cd libhttpserver/libhttpserver && patch -p0 < ../empty_uri_log_crash.patch + ifeq ($(UNAME_S),FreeBSD) +@@ -124,35 +115,17 @@ endif libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -82,6 +92,7 @@ index 13eed9c5..9abb2262 100644 - cd curl && rm -rf curl-*/ || true - cd curl && tar -zxf curl-*.tar.gz - #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} + cd curl/curl && patch configure < ../configure.patch cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} curl: curl/curl/lib/.libs/libcurl.a @@ -96,13 +107,13 @@ index 13eed9c5..9abb2262 100644 - cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch -endif --ifeq ($(OS),Darwin) +-ifeq ($(UNAME_S),Darwin) - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch -endif cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -155,8 +128,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: +@@ -163,8 +136,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/liblz4.a: @@ -111,16 +122,16 @@ index 13eed9c5..9abb2262 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/liblz4.a -@@ -181,8 +152,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -189,8 +160,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: - cd libdaemon && rm -rf libdaemon-*/ || true - cd libdaemon && tar -zxf libdaemon-0.14.tar.gz - cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && ./configure --disable-examples + cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -253,17 +222,12 @@ sqlite3/sqlite3/sqlite3.o: +@@ -264,17 +233,12 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: @@ -138,7 +149,7 @@ index 13eed9c5..9abb2262 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../include_limits.patch -@@ -273,10 +237,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: +@@ -284,10 +248,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a re2/re2/obj/libre2.a: @@ -147,9 +158,9 @@ index 13eed9c5..9abb2262 100644 -# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile -# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - cd re2/re2 && sed -i -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile - cd re2/re2 && sed -i -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile -@@ -285,8 +245,6 @@ re2/re2/obj/libre2.a: + ifeq ($(UNAME_S),Darwin) + cd re2/re2 && sed -i '' -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile +@@ -301,8 +261,6 @@ endif re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: diff --git a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix index d058a0b293..169222e4d4 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-m7tfDd0Yjg4+VHZPxYJXEx2XNNodepMcPLucBjvd88s="; + sha256 = "sha256-sVvQQm2hE5J6ZesL8YRkdq/OwzHziBCsa3D/b1kYPpw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix index 75fe60e255..e96528d7cd 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "22.11.1"; + version = "23.01.1"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0yofstZiTK/I6c8go5ENivq41nOfL+0mzIHgbQSEUWo="; + sha256 = "sha256-S4yGys1Lc2FAd3RKI4KdE9X12rsQyVcPQ+Biwwrnb0I="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix index 24340a54e8..f07b07c3a3 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,20 +15,20 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-337e447997148b9e5024c2d0ae69618b1cbf80d6"; + name = "aws-aws-sdk-php-c600a07da531d6c29af791b9d2e8b6df796aa14b"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/337e447997148b9e5024c2d0ae69618b1cbf80d6"; - sha256 = "1pwghj67zah616cvdrbs2fwgwn99jhxi95mdfq6l2jhpy59gymkc"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/c600a07da531d6c29af791b9d2e8b6df796aa14b"; + sha256 = "03iisnif804dkgnynn24y6ji1hnq95ryv8vwgwi6398apcz6vypn"; }; }; }; "bacon/bacon-qr-code" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "bacon-bacon-qr-code-d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; + name = "bacon-bacon-qr-code-8674e51bb65af933a5ffaf1c308a660387c35c22"; src = fetchurl { - url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; - sha256 = "0k2z8a6qz5xg1p85vwcp58yqbiw8bmnp3hg2pjcaqlimnf65v058"; + url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22"; + sha256 = "0hb0w6m5rwzghw2im3yqn6ly2kvb3jgrv8jwra1lwd0ik6ckrngl"; }; }; }; @@ -85,10 +85,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"; + name = "doctrine-dbal-88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"; - sha256 = "09kv9g6693gr3i2wbfc1riyzgfkm5kkamhzfj4skrsw14pvacsgf"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"; + sha256 = "1xz7yyq0r8378zb4jrac13z0762pid0dxxnaj0rx82f7vwbxaqas"; }; }; }; @@ -235,10 +235,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-7411d9fa71c1b0fd73a33e225f14512b74e6c81e"; + name = "laravel-framework-e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/7411d9fa71c1b0fd73a33e225f14512b74e6c81e"; - sha256 = "0pdxr823p52cf284yfqwncii52g4zgk2gw5prn774h26v42dwaqw"; + url = "https://api.github.com/repos/laravel/framework/zipball/e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49"; + sha256 = "1k7afj4himxmhv02lmq8dc992m2vdkw8hcjyfcnff99cv555z9ph"; }; }; }; @@ -255,20 +255,20 @@ let "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-1cd1682b709b8808a5b5dbb68179a58d1342aa7b"; + name = "laravel-socialite-dae03ca4ecfe3badafcdfb81965d2279080051f4"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/1cd1682b709b8808a5b5dbb68179a58d1342aa7b"; - sha256 = "0h37rw9ndh56dh71d8jaxidpnyr7xs42nnim88aaxas304j7jdwa"; + url = "https://api.github.com/repos/laravel/socialite/zipball/dae03ca4ecfe3badafcdfb81965d2279080051f4"; + sha256 = "1cv67knibrhyfbimgbnig4hrnq2rjyi7kqmsqyqs7il2nizl51vm"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-5062061b4924af3392225dd482ca7b4d85d8b8ef"; + name = "laravel-tinker-74d0b287cc4ae65d15c368dd697aae71d62a73ad"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef"; - sha256 = "0smv55xbj6pk223v3nfd0fi5n4l8v85c4pra98ahq3615xma3k8c"; + url = "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad"; + sha256 = "1rhppd4zzz47abjahid8hdhwrzjrnbwkcy0cqqws5dia4x81k7xb"; }; }; }; @@ -375,20 +375,20 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-ad35dd71a6a212b98e4b87e97389b6fa85f0e347"; + name = "nesbot-carbon-09acf64155c16dc6f580f36569ae89344e9734a3"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347"; - sha256 = "1a7qlk82jfxnf84v4vwwgs9b325mb07whkc5vxrqjjjp8krncxbi"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3"; + sha256 = "1m4sb4vnimg3238g0mivnxgfmf3lwkb3v2njmird20jrh48k4c69"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"; + name = "nikic-php-parser-570e980a201d8ed0236b0a62ddf2c9cbb2034039"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"; - sha256 = "0lsw925jy1y1vvsx5da6abn1ky7g6whaxx9g524jgqgbaljrjhxm"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039"; + sha256 = "1q3hnpjya4rsxfh72ccs2vj3gz8h0sn12290w8wvkz9pvi0qmmmr"; }; }; }; @@ -465,10 +465,10 @@ let "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-dbc2307d5c69aeb22db136c52e91130d7f2ca761"; + name = "phpseclib-phpseclib-f28693d38ba21bb0d9f0c411ee5dae2b178201da"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761"; - sha256 = "1xpb0wi54rg33w7w357l6vh1kg9yh0pwabhmf8r9ih35s05n58a9"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da"; + sha256 = "11hvq1mwk2zn1fgrwvifh5z4md178vzka5nfykj8l28vk7r0vb98"; }; }; }; @@ -575,10 +575,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-1acec99d6684a54ff92f8b548a4e41b566963778"; + name = "psy-psysh-e9eadffbed9c9deb5426fd107faae0452bf20a36"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778"; - sha256 = "169v5160qhq07n3mvhifrgvjqrbm0306nn2ibiqwrcfqyyhq43z0"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36"; + sha256 = "0yaj5ixg8zb6hh9swpcc29dcrpffjn4cxp61qz2zqbizvq2d6z0z"; }; }; }; @@ -595,10 +595,10 @@ let "ramsey/collection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a"; + name = "ramsey-collection-ad7475d1c9e70b190ecffc58f2d989416af339b4"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a"; - sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6"; + url = "https://api.github.com/repos/ramsey/collection/zipball/ad7475d1c9e70b190ecffc58f2d989416af339b4"; + sha256 = "1a1wqdwdrbzkf2hias2kw9crr31265pn027vm69pr7alyq2qrzfw"; }; }; }; @@ -725,20 +725,20 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-ea59bb0edfaf9f28d18d8791410ee0355f317669"; + name = "symfony-console-58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669"; - sha256 = "1qvr9av4c9kac5q2lpwiwq269rq5pxdvnvb32asysifw30zd5j3d"; + url = "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"; + sha256 = "1r8a7hra81wfs10m235qhq9xdgini4gx9hf86l1ijbp7k6aszk7b"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-c1681789f059ab756001052164726ae88512ae3d"; + name = "symfony-css-selector-052ef49b660f9ad2a3adb311c555c9bc11ba61f4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d"; - sha256 = "1v1kpfqc4njdpqqa668vkz7mqxsklzbsf62pcgdvkbg724ck4zis"; + url = "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4"; + sha256 = "1nracybpl4i2w6vcfhymd0p7bj9cnk5s2frp6dah4anfhmdjk16a"; }; }; }; @@ -755,20 +755,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-539cf1428b8442303c6e876ad7bf5a7babd91091"; + name = "symfony-error-handler-b900446552833ad2f91ca7dd52aa8ffe78f66cb2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/539cf1428b8442303c6e876ad7bf5a7babd91091"; - sha256 = "0x2r3kpip9cmdn5d47isamyas13sl43y50wfk23zwj5vh70qgh5s"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/b900446552833ad2f91ca7dd52aa8ffe78f66cb2"; + sha256 = "0rsp4l6azy715r638xbxp8aydksz8v8r2kaz2590bg7c44v52zf0"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; + name = "symfony-event-dispatcher-8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; - sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"; + sha256 = "0mp91rpqbjarbh9jzyqa8cv012ilarwa9yx2rhqvms8bhk0aq7qi"; }; }; }; @@ -785,40 +785,40 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-7872a66f57caffa2916a584db1aa7f12adc76f8c"; + name = "symfony-finder-40c08632019838dfb3350f18cf5563b8080055fc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c"; - sha256 = "111qy05azqwj14v0k034lwd970slx081x56pnicyxsbg3yc9wmnp"; + url = "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc"; + sha256 = "0gszqsqjgjf05hrycks1sgvizlfx1y6qnwh8cvcih50nmqn2q950"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-75bd663ff2db90141bfb733682459d5bbe9e29c3"; + name = "symfony-http-foundation-b64a0e2df212d5849e4584cabff0cf09c5d6866a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3"; - sha256 = "195w56aicv57nmcwsai6jklicb9qqak4imk4xwsgc3i98yw3md2w"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a"; + sha256 = "01l1349d2pab5vsihripq8718988yz1kh67bpp3j1xvgzd09b5a1"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-fc63c8c3e1036d424820cc993a4ea163778dc5c7"; + name = "symfony-http-kernel-5da6f57a13e5d7d77197443cf55697cdf65f1352"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/fc63c8c3e1036d424820cc993a4ea163778dc5c7"; - sha256 = "0z1cg1ac1r00c0i5apvk8rrglwswcy6gx9w9v5kmk7ajijnk583m"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/5da6f57a13e5d7d77197443cf55697cdf65f1352"; + sha256 = "1y0mqas5v4rhrmsgizv6pqqhxy49hm6wfs1wahaaxcm3zjip1504"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"; + name = "symfony-mime-2a83d82efc91c3f03a23c8b47a896df168aa5c63"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"; - sha256 = "1r06lijy4zbqppyfnvnq2arbjn0dwzb1d14lcy5wsbh3k3bgpsvq"; + url = "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63"; + sha256 = "1rkg5728y052hq1sag41w46kxnmyfm6jf5bn29canbnx05x32xly"; }; }; }; @@ -935,10 +935,10 @@ let "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-5c9b129efe9abce9470e384bf65d8a7e262eee69"; + name = "symfony-routing-4ce2df9a469c19ba45ca6aca04fec1c358a6e791"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69"; - sha256 = "0pa3zqqsa9jf362zdhg8jhppv1z7nnj6hq65dym473p1c3zwyfxb"; + url = "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791"; + sha256 = "1dqnxgkm817msrimhfs9l3d3k4zsjy7zgy2avaq23sm4yvm3nbyw"; }; }; }; @@ -955,10 +955,10 @@ let "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"; + name = "symfony-string-55733a8664b8853b003e70251c58bc8cb2d82a6b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"; - sha256 = "1hwji8pwsfb79sdrigbisxs0cjnhs1qbm6rrflhqyhpviwvbhyqx"; + url = "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b"; + sha256 = "0mbagzl3kmrfdkvrb2nddngnzz0cy18r59gipmfsa60n1d7bww4l"; }; }; }; @@ -985,20 +985,20 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-6894d06145fefebd9a4c7272baa026a1c394a430"; + name = "symfony-var-dumper-ad74890513d07060255df2575703daf971de92c7"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430"; - sha256 = "055s38szlhpxrhv1kjawsm5rwh6dr7drk9jpyj6a5r0g4jn63m72"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7"; + sha256 = "0i1k6x0rfg17fjbcqgppp0vmhp7y597vik7vs6475v20rmvhdncd"; }; }; }; "tijsverkoyen/css-to-inline-styles" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-4348a3a06651827a27d989ad1d13efec6bb49b19"; + name = "tijsverkoyen-css-to-inline-styles-c42125b83a4fa63b187fdf29f9c93cb7733da30c"; src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/4348a3a06651827a27d989ad1d13efec6bb49b19"; - sha256 = "0fs2w9hw0drf1hszidrmplrph7ay8m8pv58pqv26v0228m4l6vlm"; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c"; + sha256 = "0ckk04hwwz0fdkfr20i7xrhdjcnnw1b0liknbb81qyr1y4b7x3dd"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh index f61a511059..f8db51edf7 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh +++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh @@ -7,7 +7,7 @@ if ! command -v composer2nix &> /dev/null; then exit 1 fi -CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; bookstack.version)') +CURRENT_VERSION=$(nix eval -f ../../../.. --raw bookstack.version) TARGET_VERSION_REMOTE=$(curl https://api.github.com/repos/bookstackapp/bookstack/releases/latest | jq -r ".tag_name") TARGET_VERSION=${TARGET_VERSION_REMOTE:1} BOOKSTACK=https://github.com/bookstackapp/bookstack/raw/$TARGET_VERSION_REMOTE diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix index ea413c996f..480250900b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix @@ -17,7 +17,9 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE="; }; - passthru.tests = nixosTests.freshrss; + passthru.tests = { + inherit (nixosTests) freshrss-sqlite freshrss-pgsql; + }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix index 0f80c3f427..35df24afd4 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.67.1"; + version = "0.67.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - sha256 = "sha256-oc9rG1dHi5YEU8VdwldHDv1qporMk8K7wpXOrCgcc0w="; + sha256 = "sha256-O5t//UwF+AVFxeBQHRIZM5RSf4+DgUE5LHWVRKxJLfc="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; @@ -56,7 +56,12 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin $out/share/outline - mv public node_modules build $out/share/outline/ + mv node_modules build $out/share/outline/ + # On NixOS the WorkingDirectory is set to the build directory, as + # this contains files needed in the onboarding process. This folder + # must also contain the `public` folder for mail notifications to + # work, as it contains the mail templates. + mv public $out/share/outline/build node_modules=$out/share/outline/node_modules build=$out/share/outline/build diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.lock b/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.lock index 4cc338dbf6..f5b7c69fd4 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.lock +++ b/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.lock @@ -76,12 +76,12 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.18.10", "@babel/generator@^7.7.2": - version "7.18.12" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4" - integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg== +"@babel/generator@^7.18.10", "@babel/generator@^7.20.7", "@babel/generator@^7.7.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== dependencies: - "@babel/types" "^7.18.10" + "@babel/types" "^7.20.7" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -110,17 +110,18 @@ browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce" - integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw== +"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.9", "@babel/helper-create-class-features-plugin@^7.20.7": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819" + integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-create-regexp-features-plugin@^7.16.0": @@ -157,13 +158,13 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" - integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A== +"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== dependencies: - "@babel/template" "^7.18.6" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" "@babel/helper-hoist-variables@^7.16.0", "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -172,12 +173,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" - integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== +"@babel/helper-member-expression-to-functions@^7.18.9", "@babel/helper-member-expression-to-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05" + integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw== dependencies: - "@babel/types" "^7.18.9" + "@babel/types" "^7.20.7" "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6": version "7.18.6" @@ -221,16 +222,17 @@ "@babel/helper-wrap-function" "^7.16.0" "@babel/types" "^7.16.0" -"@babel/helper-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" - integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== +"@babel/helper-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.18.9", "@babel/helper-replace-supers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" + integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" "@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6": version "7.18.6" @@ -239,12 +241,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== +"@babel/helper-skip-transparent-expression-wrappers@^7.16.0", "@babel/helper-skip-transparent-expression-wrappers@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" + integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.20.0" "@babel/helper-split-export-declaration@^7.16.0", "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" @@ -263,7 +265,7 @@ 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-option@^7.14.5", "@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6": +"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== @@ -296,10 +298,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.7.0": - version "7.18.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" - integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0": version "7.16.2" @@ -582,12 +584,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" - integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== +"@babel/plugin-syntax-typescript@^7.20.0", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" + integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-transform-arrow-functions@^7.16.0": version "7.16.0" @@ -867,14 +869,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-typescript@^7.16.7": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" - integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== +"@babel/plugin-transform-typescript@^7.18.6": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz#673f49499cd810ae32a1ea5f3f8fab370987e055" + integrity sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-typescript" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-typescript" "^7.20.0" "@babel/plugin-transform-unicode-escapes@^7.16.0": version "7.16.0" @@ -994,14 +996,14 @@ "@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6" -"@babel/preset-typescript@^7.16.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" - integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== +"@babel/preset-typescript@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399" + integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-transform-typescript" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-validator-option" "^7.18.6" + "@babel/plugin-transform-typescript" "^7.18.6" "@babel/runtime-corejs3@^7.10.2": version "7.12.5" @@ -1018,35 +1020,35 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.16.0", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== +"@babel/template@^7.16.0", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7", "@babel/template@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": - version "7.18.11" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f" - integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" + integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.10" + "@babel/generator" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.18.11" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" - integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -10062,10 +10064,10 @@ jsdom@^19.0.0: ws "^8.2.3" xml-name-validator "^4.0.0" -jsdom@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" - integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== +jsdom@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" + integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== dependencies: abab "^2.0.6" acorn "^8.8.1" diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.nix index 8f4cbb4b8b..6e2aa068ae 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.nix @@ -58,11 +58,11 @@ }; } { - name = "_babel_generator___generator_7.18.12.tgz"; + name = "_babel_generator___generator_7.20.7.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.18.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz"; - sha512 = "dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg=="; + name = "_babel_generator___generator_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.20.12.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; - sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz"; + sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ=="; }; } { @@ -130,11 +130,11 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; - sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; } { @@ -146,11 +146,11 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; - sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz"; + sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw=="; }; } { @@ -194,11 +194,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; - sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; + name = "_babel_helper_replace_supers___helper_replace_supers_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"; + sha512 = "vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A=="; }; } { @@ -210,11 +210,11 @@ }; } { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.20.0.tgz"; path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"; + sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg=="; }; } { @@ -274,11 +274,11 @@ }; } { - name = "_babel_parser___parser_7.18.11.tgz"; + name = "_babel_parser___parser_7.20.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.18.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz"; - sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; + name = "_babel_parser___parser_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; } { @@ -570,11 +570,11 @@ }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.10.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz"; - sha512 = "xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ=="; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"; + sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ=="; }; } { @@ -858,11 +858,11 @@ }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.8.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.20.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz"; - sha512 = "bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ=="; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz"; + sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw=="; }; } { @@ -906,11 +906,11 @@ }; } { - name = "_babel_preset_typescript___preset_typescript_7.16.7.tgz"; + name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz"; - sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; + name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; + sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; }; } { @@ -930,27 +930,27 @@ }; } { - name = "_babel_template___template_7.18.10.tgz"; + name = "_babel_template___template_7.20.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + name = "_babel_template___template_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; } { - name = "_babel_traverse___traverse_7.18.11.tgz"; + name = "_babel_traverse___traverse_7.20.12.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.18.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz"; - sha512 = "TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ=="; + name = "_babel_traverse___traverse_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; } { - name = "_babel_types___types_7.20.5.tgz"; + name = "_babel_types___types_7.20.7.tgz"; path = fetchurl { - name = "_babel_types___types_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz"; - sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; + name = "_babel_types___types_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; } { @@ -10482,11 +10482,11 @@ }; } { - name = "jsdom___jsdom_20.0.3.tgz"; + name = "jsdom___jsdom_21.0.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_20.0.3.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; - sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; + name = "jsdom___jsdom_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz"; + sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; }; } { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix index e7756e4bb3..b200ae637f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; preBuild = '' cp ${./go.mod} go.mod diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix index 0026e5bdbc..60a8e22a48 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix @@ -27,7 +27,7 @@ toPythonModule (buildPythonApplication rec { certifi python-dateutil flask - flaskbabel + flask-babel gevent grequests jinja2 diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix index 0ddfc5351e..2b1a6f69b5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { certifi python-dateutil flask - flaskbabel + flask-babel brotli jinja2 langdetect diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix index 829ad9442f..7dd98c553f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-KBUN/vBm2st5mfqmrwUv8w4QcgSKerfY51LQbWRn7To="; + sha256 = "sha256-VSzjP6fC9zxUnY3ZhapRUXUS4V7+BVvXJKrxm71CK4o="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-ke4jhOhD24zSpQI1nxKoJ05yN/SfCku+wiNuDKr78rw="; + vendorSha256 = "sha256-8qaEMHBZcop1wH3tmNKAAMEYA4qrE6dlwxhRsCDeZaY="; # checks need to be disabled because of needed internet for some checks doCheck = false; @@ -48,6 +48,7 @@ buildGoModule rec { passthru.tests.vikunja = nixosTests.vikunja; meta = { + changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; description = "API of the Vikunja to-do list app"; homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix index 6cbca199ea..14787835f7 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.20.2"; + version = "0.20.3"; + src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-7WvitR40eJPPdqwZm8C7spvEIdFIY3SGc/w4VY7spgk="; + sha256 = "sha256-+VtdgbJaXcPlO70Gqsur6osBb7iAvVnPv2iaHbs2Rmk="; }; nativeBuildInputs = [ unzip ]; @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { passthru.tests.vikunja = nixosTests.vikunja; meta = { + changelog = "https://kolaente.dev/vikunja/frontend/src/tag/v${version}/CHANGELOG.md"; description = "Frontend of the Vikunja to-do list app"; homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index 4fb9c43380..1e6763c39c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -16,7 +16,7 @@ let pname = "wallabag"; - version = "2.5.3"; + version = "2.5.4"; in stdenv.mkDerivation { inherit pname version; @@ -27,7 +27,7 @@ stdenv.mkDerivation { "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz" "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz" ]; - hash = "sha256-a30z9rdXcfc2eVuShEobgDWWHr9TfMwq9WwaWdrI3QU="; + hash = "sha256-yVMQXjGB8Yv1klQaHEbDGMZmOtANRocFJnawKn10xhg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix index 6df706e22b..17714ada38 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.295"; + version = "2.5.296"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-itiW9/QtNpc8cFS5skwlc3JSWoVqbBbIcSlEd+GRkH0="; + sha256 = "sha256-05rGNKL7K4FgEUXH34jl9h4diCdwFRY98qDO+w9B52s="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix index ae30254614..582ec11231 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "22.1.7"; + version = "22.1.8"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-1Tr6xscZU/XPZtA9KJ2s2JYdpb0wnB3/El1ZVdnbX3Y="; + sha256 = "sha256-0R7u5zKQuI6o2kKn2TUN7fq6hWzkrkTljARa2eyqL3M="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index b05b963784..e24397773d 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-BmkSpl+6aUTiueB9VILOcmJM+tCxK2NbqJvJYfoyvBo="; + hash = "sha256-e/pV2W9POUxKhuX5RT9INEqneC65V4dg66ywTR9YUyI="; }; - npmDepsHash = "sha256-ZrUbn/6hbbBRng+TJG6cxBUJ4Td4/P6MoeKVkInPmb4="; + npmDepsHash = "sha256-sHXTwT5gXi5CkfMU/eZDMgsX2qymMhvUEtfUo6MV3hA="; nativeBuildInputs = [ python3 diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix index f506ba36c1..1149c082ca 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix @@ -11,6 +11,10 @@ buildFishPlugin { sha256 = "sha256-NQa12L0zlEz2EJjMDhWUhw5cz/zcFokjuCK5ZofTn+Q="; }; + postInstall = '' + cp conf.d/executables $out/share/fish/vendor_conf.d/ + ''; + meta = with lib; { description = "grc Colourizer for some commands on Fish shell"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 68b2f95a40..2f89521f93 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-KFCsZmD83FqnB553Tbub95I7s8QGBMZ3rviKAQNcKqA="; + sha256 = "sha256-u8/SvuR/RpJaBX4Dr3Onrk0AVpIAeVb+399+NUpgkfI="; }; - cargoSha256 = "sha256-DpPyvNr1gh7w9HesmkH6N3ZGOmoZx/BDOQ0fQk84bE8="; + cargoSha256 = "sha256-hnSumfZd9ylEx3dkTGW2s4VSv107MHOn21ytOcimhPw="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix new file mode 100644 index 0000000000..5fcad36035 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "agdsn-zsh-config"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "agdsn"; + repo = "agdsn-zsh-config"; + rev = "v${version}"; + sha256 = "sha256-/l2fE4ZsZ6f89fYG9sTEV1mrXZ3MLXx6K3CTUQHiAsc="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D -m644 zshrc-base-hw.zsh "$out/etc/zsh/zshrc" + install -D -m644 zshrc-home.zsh "$out/etc/skel/.zshrc" + install -D -m644 zshrc-home.zsh "$out/etc/zsh/newuser.zshrc.recommended" + install -D -m644 profile-d-agdsn-zsh-config.sh "$out/etc/profile.d/agdsn-zsh-config.sh" + + runHook postInstall + ''; + + meta = with lib; { + description = "A modified version of the Grml Zsh configuration specialised for the needs of system administration"; + homepage = "https://github.com/agdsn/agdsn-zsh-config"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fugi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 4fb615d370..d00017f9a9 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-01-26"; + version = "2023-02-05"; pname = "oh-my-zsh"; - rev = "e55e3f0f56ab4df21eb33e19569c295e7e5e71a4"; + rev = "9b91e8256011240cbf65ba65fbe55c5fd9dbae07"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "gN5jjhbRxSBJiXs1DsUeMHCCsv9qSOxC4guHmjJdW7U="; + sha256 = "kdFfctEqRChVH5zRBL0yLQEwdUnmILBsuU10n2YWlu0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix index f78723ee6e..02f1f6513c 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-BmzYAgP5Z77VqcpAB49cQLNuvQX1qcKmAh9BuXsy2pA="; + sha256 = "sha256-ZL/x5FNklRa5JnZ5UUofnIcW4dCInaEvTLBQfMJDWIM="; }; strictDeps = true; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix index ff1a5f7d9c..0bfbd9cd4b 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "zsh-forgit"; - version = "23.01.0"; + version = "23.02.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - sha256 = "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk="; + sha256 = "sha256-PGFYw7JbuYHOVycPlYcRItElcyuKEg2cGv4wn6In5Mo="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix index 2ee8c070ae..46929315f0 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -98,7 +98,6 @@ rec { doSign = localSystem.isAarch64 && last != null; doUpdateAutoTools = localSystem.isAarch64 && last != null; - inherit (last.pkgs) runCommandLocal; mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 751e19d168..9d99be2a02 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -271,6 +271,7 @@ let sourceProvenance = listOf lib.types.attrs; maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix priority = int; + pkgConfigModules = listOf str; platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch hydraPlatforms = listOf str; broken = bool; diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 517cfc03ae..08bd836e10 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -392,10 +392,8 @@ else let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamily = platform: with platform; /**/ if isAarch32 then "arm" - else if isAarch64 then "aarch64" else if isx86_32 then "x86" - else if isx86_64 then "x86_64" - else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + else platform.uname.processor; crossFile = builtins.toFile "cross-file.conf" '' [properties] diff --git a/third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix index ca8eac38aa..3b09b150a0 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xosview"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "hills"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-CoBVFTCpvZkIe/g+17JNV1y0G9K+t+p3EE9C5kuBe2k="; + hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix index 8bee8a2e7a..ddbcaf0518 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-yX95qmcyouSSjEHorMpRJjZyrxIjQorwTpGtGZN4s6s="; + sha256 = "sha256-Y9Z2PdQU7yHTlEXW+/C6v9k+5TkeQMagbC/gGG+JssQ="; }; - cargoSha256 = "sha256-DweJ608aJChn2ezAM7Ly0cwtLAvM1DZ5gc4WUVyKIco="; + cargoHash = "sha256-ZDyB/s2ig3aklEeB1JzNHat+roQniKrMcw4rvy9Z5pk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "This is a small utility, typically used in conjunction with Ignition, which reads metadata from a given cloud-provider and applies it to the system."; license = licenses.asl20; maintainers = [ maintainers.arianvp ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 6eb8485524..33cb045a4a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.19"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.21"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-0Z4jTN9+bsurCYqJcYqG0r0ed3gWG9PDgT5J/+stiPE="; + hash = "sha256-/CMV6eCNm2gF9HhdoTo2TUUy7I4NF9Fb+6l2biGIbkE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index e3b2ae74ca..ed9d9007a9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-WCkVCND3c8HYLi0UrgF3zoEykIs1/D7HgeblZETvU4M="; + sha256 = "sha256-CKtDj9Ht81i8EcpjHqluWfwkEU15a/TZd6N+jCSzIc8="; }; - vendorHash = "sha256-FBKwWApiIs0y0IZqJOJwzdBq1ihaPv8mqqSTO42ggi0="; + vendorHash = "sha256-aSXj21JNqX/cc62oFqyedmvczmudcV7RhLyWrKsdOMQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix index 88621f2365..1471f039d3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0="; + sha256 = "sha256-So6S/AyuuHpezu4FMDOXDOdJqvEexbgpmLhDnDbbUuM="; }; - vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8="; + vendorHash = "sha256-wFKQv/9GtXMnTP+HkmmHO0RgQ98jm1GZeIGIJiqWx1I="; subPackages = [ "cmd/console" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix index bf1ad3cfe4..c1753fe1a5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix @@ -30,16 +30,24 @@ buildPythonApplication rec { sqlparse ]; - nativeCheckInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook glibcLocales ]; - checkPhase = '' + preCheck = '' export HOME=. export LC_ALL="en_US.UTF-8" - - py.test \ - --ignore=mycli/packages/paramiko_stub/__init__.py ''; + disabledTestPaths = [ + "mycli/packages/paramiko_stub/__init__.py" + ]; + + disabledTests = [ + # Note: test_auto_escaped_col_names is currently failing due to a bug upstream. + # TODO: re-enable this test once there is a fix upstream. See + # https://github.com/dbcli/mycli/issues/1103 for details. + "test_auto_escaped_col_names" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "cryptography == 36.0.2" "cryptography" diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/check-system-config-dir.patch b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/check-system-config-dir.patch new file mode 100644 index 0000000000..f614bab64e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/check-system-config-dir.patch @@ -0,0 +1,17 @@ +diff --git a/web/config.py b/web/config.py +index 4774043..5b73fd3 100644 +--- a/web/config.py ++++ b/web/config.py +@@ -884,6 +884,12 @@ if os.path.exists(system_config_dir + '/config_system.py'): + user_config_settings.update(config_system_settings) + except ImportError: + pass ++ except PermissionError: ++ print(f"Permission denied to open {str(system_config_dir + '/config_system.py')}. \n \ ++ If you are running pgadmin4-desktopmode please make sure you disable \n \ ++ the pgadmin NixOS module first. If you rely on settings in \n \ ++ {str(system_config_dir + '/config_system.py')}, please check the correct permissions.") ++ pass + + # Update settings for 'LOG_FILE', 'SQLITE_PATH', 'SESSION_DB_PATH', + # 'AZURE_CREDENTIAL_CACHE_DIR', 'KERBEROS_CCACHE_DIR', 'STORAGE_DIR' \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 0d0b63711d..a83d96779d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -6,15 +6,19 @@ , sphinx , nixosTests , pkgs +, fetchPypi +, postgresqlTestHook +, postgresql +, server-mode ? true }: let pname = "pgadmin"; - version = "6.18"; + version = "6.19"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-qqilmJLpJ3XNd8dwk7bDAAPxt8sou5zydFMPcJGcGoo="; + sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI="; }; yarnDeps = mkYarnModules { @@ -25,55 +29,21 @@ let yarnNix = ./yarn.nix; }; - # move buildDeps here to easily pass to test suite - buildDeps = with pythonPackages; [ - flask - flask-gravatar - flask-login - flask_mail - flask_migrate - flask-sqlalchemy - flask-wtf - flask-compress - passlib - pytz - simplejson - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - flask-babelex - flask-babel - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - botocore - boto3 - azure-mgmt-subscription - azure-mgmt-rdbms - azure-mgmt-resource - azure-identity - ]; # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + # flask-security-too 4.1.5 is incompatible with flask-babel 3.x + flask-babel = prev.flask-babel.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = fetchPypi { + inherit pname version; + sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + }; + nativeBuildInputs = [ ]; + format = "setuptools"; + outputs = [ "out" ]; + }); # flask 2.2 is incompatible with pgadmin 6.18 # https://redmine.postgresql.org/issues/7651 flask = prev.flask.overridePythonAttrs (oldAttrs: rec { @@ -92,7 +62,7 @@ let hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; }; }); - # pgadmin 6.18 is incompatible with the major flask-security-too update to 5.0.x + # pgadmin 6.19 is incompatible with the major flask-security-too update to 5.0.x flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { version = "4.1.5"; src = oldAttrs.src.override { @@ -119,6 +89,8 @@ pythonPackages.buildPythonApplication rec { patches = [ # Expose setup.py for later use ./expose-setup.py.patch + # check for permission of /etc/pgadmin/config_system and don't fail + ./check-system-config-dir.patch ]; postPatch = '' @@ -134,10 +106,12 @@ pythonPackages.buildPythonApplication rec { # relax dependencies sed 's|==|>=|g' -i requirements.txt - # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ - --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ - --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" + --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" + ${lib.optionalString (!server-mode) '' + substituteInPlace web/config.py \ + --replace "SERVER_MODE = True" "SERVER_MODE = False" + ''} ''; preBuild = '' @@ -185,23 +159,110 @@ pythonPackages.buildPythonApplication rec { pythonPackages.wheel ]; - # tests need an own data, log directory - # and a working and correctly setup postgres database - # checks will be run through nixos/tests - doCheck = false; - - # speaklater3 is separate because when passing buildDeps - # to the test, it fails there due to a collision with speaklater - propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; + propagatedBuildInputs = with pythonPackages; [ + flask + flask-gravatar + flask-login + flask_mail + flask_migrate + flask-sqlalchemy + flask-wtf + flask-compress + passlib + pytz + simplejson + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + botocore + boto3 + azure-mgmt-subscription + azure-mgmt-rdbms + azure-mgmt-resource + azure-identity + sphinxcontrib-youtube + dnspython + greenlet + speaklater3 + ]; passthru.tests = { - standalone = nixosTests.pgadmin4-standalone; - # regression and function tests of the package itself - package = import ../../../../nixos/tests/pgadmin4.nix { inherit pkgs buildDeps; pythonEnv = pythonPackages; }; + inherit (nixosTests) pgadmin4; }; + nativeCheckInputs = [ + postgresqlTestHook + postgresql + pythonPackages.testscenarios + pythonPackages.selenium + ]; + + checkPhase = '' + runHook preCheck + + ## Setup ## + + # pgadmin needs a home directory to save the configuration + export HOME=$TMPDIR + cd pgadmin4 + + # set configuration for postgresql test + # also ensure Server Mode is set to false. If not, the tests will fail, since pgadmin expects read/write permissions + # in /var/lib/pgadmin and /var/log/pgadmin + # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226 + cp -v regression/test_config.json.in regression/test_config.json + substituteInPlace regression/test_config.json --replace "localhost" "$PGHOST" + substituteInPlace regression/runtests.py --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" + + ## Browser test ## + + # don't bother to test kerberos authentication + python regression/runtests.py --pkg browser --exclude browser.tests.test_kerberos_with_mocking + + ## Reverse engineered SQL test ## + + python regression/runtests.py --pkg resql + + runHook postCheck + ''; + meta = with lib; { - description = "Administration and development platform for PostgreSQL"; + description = "Administration and development platform for PostgreSQL${optionalString (!server-mode) ". Desktop Mode"}"; + longDescription = '' + pgAdmin 4 is designed to meet the needs of both novice and experienced Postgres users alike, + providing a powerful graphical interface that simplifies the creation, maintenance and use of database objects. + ${if server-mode then '' + This version is build with SERVER_MODE set to True (the default). It will require access to `/var/lib/pgadmin` + and `/var/log/pgadmin`. This is the default version for the NixOS module `services.pgadmin`. + This should NOT be used in combination with the `pgadmin4-desktopmode` package as they will interfere. + '' else '' + This version is build with SERVER_MODE set to False. It will require access to `~/.pgadmin/`. This version is suitable + for single-user deployment or where access to `/var/lib/pgadmin` cannot be granted or the NixOS module cannot be used. + This should NOT be used in combination with the NixOS module `pgadmin` as they will interfere. + ''} + ''; homepage = "https://www.pgadmin.org/"; license = licenses.mit; changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json index cd30686bf0..462d82e213 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json @@ -112,7 +112,6 @@ "classnames": "^2.2.6", "closest": "^0.0.1", "codemirror": "^5.59.2", - "context-menu": "^2.0.0", "convert-units": "^2.3.4", "cssnano": "^5.0.2", "dagre": "^0.8.4", @@ -123,8 +122,6 @@ "insert-if": "^1.1.0", "ip-address": "^7.1.0", "jquery": "^3.6.0", - "jquery-contextmenu": "^2.9.2", - "jquery-ui": "^1.13.2", "json-bignumber": "^1.0.1", "jsoneditor": "^9.5.4", "jsoneditor-react": "^3.1.1", @@ -140,14 +137,13 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", "react": "^17.0.1", "react-aspen": "^1.1.0", "react-checkbox-tree": "^1.7.2", - "react-data-grid": "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8", + "react-data-grid": "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^17.0.1", @@ -169,7 +165,7 @@ "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.19.3", "valid-filename": "^2.0.1", - "webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", + "webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", "wkx": "^0.5.0", "xterm": "^4.11.0", "xterm-addon-fit": "^0.5.0", diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock index 463e68254f..df20a984a8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock @@ -2340,7 +2340,7 @@ aspen-core@^1.0.4: p-series "^1.1.0" path-fx "^2.1.1" -aspen-decorations@^1.0.2, aspen-decorations@^1.1.1: +aspen-decorations@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz#7d0ca740efab1aa4fd91a1f3db81ac29186607a3" integrity sha512-Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ== @@ -3385,13 +3385,6 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -context-menu@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz#565f13210248e3442700e6b1a2d63406f2b08552" - integrity sha512-VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg== - dependencies: - tiny-emitter "^2.0.2" - convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" @@ -6133,21 +6126,14 @@ jmespath@^0.16.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== -jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: +jquery-contextmenu@^2.6.4: version "2.9.2" resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced" integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw== dependencies: jquery "^3.5.0" -jquery-ui@^1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" - integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q== - dependencies: - jquery ">=1.8.0 <4.0.0" - -"jquery@>=1.7.1 <4.0.0", "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0: +"jquery@>=1.7.1 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0: version "3.6.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== @@ -6238,16 +6224,16 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" json5@^2.1.2, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" jsoneditor-react@^3.1.1: version "3.1.2" @@ -7831,27 +7817,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6": - version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6" - dependencies: - "@types/classnames" "^2.2.6" - "@types/react" "^16.7.18" - "@types/react-dom" "^16.0.11" - aspen-decorations "^1.1.1" - browserfs "^1.4.3" - classnames "^2.2.6" - context-menu "^2.0.0" - insert-if "^1.1.0" - lodash "4.*" - notificar "^1.0.1" - path-fx "^2.0.0" - react "^16.6.3" - react-aspen "^1.2.0" - react-dom "^16.6.3" - react-virtualized-auto-sizer "^1.0.6" - valid-filename "^2.0.1" - picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -8531,7 +8496,7 @@ re-resizable@6.9.6: dependencies: fast-memoize "^2.5.1" -react-aspen@^1.1.0, react-aspen@^1.2.0: +react-aspen@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95" integrity sha512-w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg== @@ -8552,9 +8517,9 @@ react-checkbox-tree@^1.7.2: nanoid "^3.0.0" prop-types "^15.5.8" -"react-data-grid@git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8": +"react-data-grid@git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8": version "7.0.0-beta.14" - resolved "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8" + resolved "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: clsx "^1.1.1" @@ -8576,16 +8541,6 @@ react-dnd@^16.0.1: fast-deep-equal "^3.1.3" hoist-non-react-statics "^3.3.2" -react-dom@^16.6.3: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" - react-dom@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" @@ -8747,15 +8702,6 @@ react-window@^1.3.1, react-window@^1.8.5: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^16.6.3: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - react@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" @@ -9117,14 +9063,6 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -9997,11 +9935,6 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" -tiny-emitter@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" @@ -10404,9 +10337,9 @@ watchpack@^2.4.0: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" -"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8": +"webcabin-docker@git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8": version "2.2.5" - resolved "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8" + resolved "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8" dependencies: "@fortawesome/fontawesome-free" "^5.14.0" FileSaver "^0.10.0" diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix index 0b9a478657..d4c5e2c7b1 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix @@ -3433,14 +3433,6 @@ sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; } - { - name = "context_menu___context_menu_2.0.0.tgz"; - path = fetchurl { - name = "context_menu___context_menu_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz"; - sha512 = "VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg=="; - }; - } { name = "convert_source_map___convert_source_map_1.9.0.tgz"; path = fetchurl { @@ -6385,14 +6377,6 @@ sha512 = "6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw=="; }; } - { - name = "jquery_ui___jquery_ui_1.13.2.tgz"; - path = fetchurl { - name = "jquery_ui___jquery_ui_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz"; - sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; - }; - } { name = "jquery___jquery_3.6.1.tgz"; path = fetchurl { @@ -6530,19 +6514,19 @@ }; } { - name = "json5___json5_1.0.1.tgz"; + name = "json5___json5_1.0.2.tgz"; path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + name = "json5___json5_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz"; + sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -8361,22 +8345,6 @@ sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; } - { - name = "pgadmin4-treeview"; - path = - let - repo = fetchgit { - url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "96ceb7f27f43660a804e61d23a76aeb9aa188bb6"; - sha256 = "1hvr7arywz8rql19ma6w6lj5hrfn8xr4cyiia4bw5l8d061ak1gj"; - }; - in - runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C ${repo} . - ''; - } { name = "picocolors___picocolors_1.0.0.tgz"; path = fetchurl { @@ -9148,18 +9116,16 @@ { name = "react-data-grid.git"; path = - let - repo = fetchgit { - url = "https://github.com/EnterpriseDB/react-data-grid.git/"; - rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8"; - sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15"; - }; - in - runCommand "react-data-grid.git" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C ${repo} . - ''; + let repo = fetchgit { + url = "https://github.com/pgadmin-org/react-data-grid.git/"; + rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8"; + sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15"; + }; + in runCommand "react-data-grid.git" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; } { name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz"; @@ -9177,14 +9143,6 @@ sha512 = "QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q=="; }; } - { - name = "react_dom___react_dom_16.14.0.tgz"; - path = fetchurl { - name = "react_dom___react_dom_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; - sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; - }; - } { name = "react_dom___react_dom_17.0.2.tgz"; path = fetchurl { @@ -9361,14 +9319,6 @@ sha512 = "D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ=="; }; } - { - name = "react___react_16.14.0.tgz"; - path = fetchurl { - name = "react___react_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; - sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; - }; - } { name = "react___react_17.0.2.tgz"; path = fetchurl { @@ -9785,14 +9735,6 @@ sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } - { - name = "scheduler___scheduler_0.19.1.tgz"; - path = fetchurl { - name = "scheduler___scheduler_0.19.1.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; - sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; - }; - } { name = "scheduler___scheduler_0.20.2.tgz"; path = fetchurl { @@ -10769,14 +10711,6 @@ sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q=="; }; } - { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - path = fetchurl { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; - sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; - }; - } { name = "tiny_warning___tiny_warning_1.0.3.tgz"; path = fetchurl { @@ -11290,20 +11224,18 @@ }; } { - name = "wcDocker"; + name = "wcdocker"; path = - let - repo = fetchgit { - url = "https://github.com/EnterpriseDB/wcDocker/"; - rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8"; - sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg"; - }; - in - runCommand "wcDocker" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C ${repo} . - ''; + let repo = fetchgit { + url = "https://github.com/pgadmin-org/wcdocker/"; + rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8"; + sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg"; + }; + in runCommand "wcdocker" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; } { name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index c27cbcb35d..72767fb84c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.53.1"; + version = "3.54.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-linux-x64.tar.gz"; - sha256 = "1fayslha6815y1jl9w9c2igd8hpc8z0wsw9nssjp545lpqq5c3d1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-linux-x64.tar.gz"; + sha256 = "0qp32lzdsz806f0jvl6900h4z5597c7yijga24f88c1k90kzyx3f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz"; @@ -17,8 +17,8 @@ sha256 = "1x0vv5b61achyysm5inffi9dh2nry7qkr62iqjml4n7qb9f3dcxd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-linux-amd64.tar.gz"; - sha256 = "1ldizdak0x139sz4h0f7xbfiycywdi386a0gjgmxwm3fjnpkr0hh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-linux-amd64.tar.gz"; + sha256 = "1hfwk31xxdsqgjckvrqr8n1awdl7spkij71qbrrnzf3bngyaq2lv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "01zjsw7f9r2andc6am09qhs2gy9189i3bvkdyxmv6bkh7907z8pg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-linux-amd64.tar.gz"; - sha256 = "1xk7a0ivmhjxscb275yilg4wxypsmrpfafws6ab49ibyrg06j7z3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-linux-amd64.tar.gz"; + sha256 = "04spn0180c5y90xvpadwd8ym3ffywvi4nbmjpa1qhy7j20zpd698"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "0cyrrxd2iyrf8zbvn46vbi6ayg93l284y66lwcggdqh3snj3gc7y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-amd64.tar.gz"; - sha256 = "0dwnrqng4w02wcmznksdxksak9kgfrj6pg2jny175a1lr6584blf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-linux-amd64.tar.gz"; + sha256 = "00ispk56g2jb9c410r6khdysyq0g3crn42sa4vq5bmgzkrsz78yv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "15mygp5kbj3z868dfz3w00srm88qn6i38dgfsclhs2flj9h989wh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-linux-amd64.tar.gz"; - sha256 = "0jvq074a2nycn5b146zc7c08h1b9rvjnfdhc78jjs69knbxinnkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-linux-amd64.tar.gz"; + sha256 = "0c3s36a93pgidv81frbczyqai23d61cs3a6k2zck7kz9l7796mm8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-amd64.tar.gz"; @@ -85,20 +85,20 @@ sha256 = "094vc026li9s76y05p778siikq0dg6lgqdnx4cby4qqipfwvnf7m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-linux-amd64.tar.gz"; - sha256 = "1mm6b8pik79axixyca6vi1vcmwcwpksli3pf26a7q3cxn7qlillb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-linux-amd64.tar.gz"; + sha256 = "0798n2rl43scazjhdmyfx7pi0dfil4gdwl46q5gaqf6jpk4wakdw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-amd64.tar.gz"; sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-amd64.tar.gz"; - sha256 = "1xx1i59c08p2vkclq5z5brlzp6hyk7qyi09xvx49159gqidzxlv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-linux-amd64.tar.gz"; + sha256 = "1bh70bqjp5jq56yxf4ggvnvz9v1271wads6gmhlik4f0fvss3v8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; - sha256 = "0cndpj0fiqy90sv6r5zvd2kcs5xbk84w8619lwgi0n03isylilc0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-linux-amd64.tar.gz"; + sha256 = "1cmd779ldxfazksgiyxpagg84a6k5ckqmpf0kq0z7s9s7a6favy8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; @@ -121,12 +121,12 @@ sha256 = "1fhynzw38l7agc4wm8c92n7ig3gnl7gskzq697hq8dk4r7xl2179"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-amd64.tar.gz"; - sha256 = "1nxa130a46icjqd7vr466klg445xl3611185vn7s4h7vcm2h30s9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-linux-amd64.tar.gz"; + sha256 = "0znz88v2w0fb6yzjjhfs20ampwjngyzskna26qid42d40jbxyqxm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-linux-amd64.tar.gz"; - sha256 = "111pddfcqr20g4dnq4jbks9ds04admywp3sj09yx44ld36psj2rl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-linux-amd64.tar.gz"; + sha256 = "0gfsji7vgxk0kanfbjaxf1ia79n8x3qqhkm2fdhxqlscc0d6vpgp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "1k9q3b06fy61bvfgr76f22v7q0qaxrb8msm25k77h0x9di48mn1c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz"; - sha256 = "1l3iplqqndvx98bcil1z2vhnmaldvrgyggbs2f15jyz4iv2k822k"; + 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.3.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-darwin-x64.tar.gz"; - sha256 = "18v8zhd4yck5s71s00plkdja54fjg82xcx8rkg79jyhvqj3ll2hr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-darwin-x64.tar.gz"; + sha256 = "09n7q0c218w74vqx3idhjjzqb6wcq3ynqpqnss9w4n7qxxcm953f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz"; @@ -175,8 +175,8 @@ sha256 = "1p06n6g4a6mhlfkw38v3xdbci40y4yhin61bw32nqyfg9j1gj87l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-darwin-amd64.tar.gz"; - sha256 = "13rnilz34bnlggc4gxkl0pw38j8h45ndbgxjljzr8szwm4q8kssm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-darwin-amd64.tar.gz"; + sha256 = "1bm1nv00ik2hvncinqwkir9vsixcr05jib5ihhzwcsl1gqgl3i84"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-amd64.tar.gz"; @@ -187,8 +187,8 @@ sha256 = "0ypm2xknhz09cmzj57d5r8axn4jscb8r8z9sqx88y3fsh14s3j6d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-darwin-amd64.tar.gz"; - sha256 = "0vy36yyms38d1vqj9fh4zrb9l0hpsdwjazfx7995v4wjkhyiczfg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-darwin-amd64.tar.gz"; + sha256 = "0qbiihqj7dqq85gmy4dkyffaa82z2sz8mq0rjxha9831qcs5qy3c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "1dz6vi3c067f51p3ya43hahc82w9r3ywhxdxmbnjc1sk7py1pbi4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-amd64.tar.gz"; - sha256 = "08v8s77plv9fv5bjx6g6wfq1fxknmmacws33zgl06vqdgdsfg1gx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-darwin-amd64.tar.gz"; + sha256 = "1xlhaqb4hpdk5gppcj7014xw3a3x0n8cgyb90j4gi4gczwzq6blg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "0dzxv7qkk68bxw9p5xbmb40sqqnbf8dckpk352f5802x78wxhaf5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-darwin-amd64.tar.gz"; - sha256 = "04y1a4w9ki6fil6jxb7ljarf9hcjkavhw9wla1pz403y6wyvrp5r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-darwin-amd64.tar.gz"; + sha256 = "0ysfyyb0s4r5pph32qik09qzdxn6ac2b601fpfx9cjn8aamcz0nq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-amd64.tar.gz"; @@ -243,20 +243,20 @@ sha256 = "12imy2q8bl255cmc26swa6kflcb08gkh7mnvwxss8nzj0a6rl8vw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-darwin-amd64.tar.gz"; - sha256 = "1cbvk8xxsgg0hzw1kc6f0mn77ws3aw1zrvmx67mgjjab2ljz6aks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-darwin-amd64.tar.gz"; + sha256 = "016n1dknmlhizjh6z923kr68ma7z0xhbxg29kjfay83gn216r4am"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-amd64.tar.gz"; sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-amd64.tar.gz"; - sha256 = "1sgfc3f5h82zlqbgl29p9jffr125yypfh6hjfnpqjpy25mlxcpz8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-darwin-amd64.tar.gz"; + sha256 = "1mcjjdi8lvn0lk78y5jbfcl7k78kq83k83bsbi3bvc5wkskv1y2h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; - sha256 = "1vl28h3vjxlcl86s8c74qx34wfxwx5rc0ba26zjjv0q91pklmlh8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-darwin-amd64.tar.gz"; + sha256 = "0v2qd5jlbnsd85mzw4c465ykjzm92w288vfdd0jgkqqc3kf4cyax"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; @@ -279,12 +279,12 @@ sha256 = "15gpjmak6xp3fwa6rp3whl0aah7m1fmdvpy9icnjxagmd4ixpf1r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-amd64.tar.gz"; - sha256 = "0is852yq285vs2n79qdq20jn9y0f981a622gfq8c0l7hkjqc97dz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-darwin-amd64.tar.gz"; + sha256 = "09mzdd4271ifmn3b4nm0b47zmkqj408y1dg6d5c4nib67fb8glcq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-darwin-amd64.tar.gz"; - sha256 = "07c986zq340iil42kd46yd7hijffq6kyyv83chr3k6bjj5kki1wx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-darwin-amd64.tar.gz"; + sha256 = "0nzlx81yk674xkr2r7q4fkl84c8cxn3ahw9983vsy4jq9a0ik81k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "0j7ydd39gp86srlk3319hniy9wikjyp4zc0gnxxq641dddnpscdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz"; - sha256 = "1gxk3gcyqk688m9dv2p4flbm1dw0z9478xip6jqaiw4awkrzbnns"; + 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.3.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-linux-arm64.tar.gz"; - sha256 = "1937vk1k9iwlb2hn020grzlzzks0y94v0y20xz85f9ydnj14wp3l"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-linux-arm64.tar.gz"; + sha256 = "1dixd7dckinp5vj52kb9rzp4qpcacppyv3qwbisxl2g4dadlf88v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz"; @@ -333,8 +333,8 @@ sha256 = "0scpn0mz4ljqwb473j1xk39z0cmjv87lmnd3s9fm5rijqcinjw6y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-linux-arm64.tar.gz"; - sha256 = "059wgdaj1k87r9lrh60jhdyh5q10li72q9jshw4bid57l78gpfxz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-linux-arm64.tar.gz"; + sha256 = "0qplrij1bbpsdcmxzixrlkb2l49c21alla2g70aqm0vxkpjscn7m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-arm64.tar.gz"; @@ -345,8 +345,8 @@ sha256 = "0m773l7289rqpkyzmfbdsg4v6m531p8mp4mjhr6px5amii7875qz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-linux-arm64.tar.gz"; - sha256 = "0dwn1v64lsqnx7l0fx6lk719d11ykqv61maiwk144w3fi5ijdpv2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-linux-arm64.tar.gz"; + sha256 = "1z2jss2yc3fylqc8hpgfy4sqyvkgcbmf4hngdzphnknqapiz927w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "14qpxps76y1jc995l9h1m3nwbkna0fsa6hm32m11qw9c4clk7npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-arm64.tar.gz"; - sha256 = "0bx2dczfm1zqpkclyf1pj0m0iv2w7c3dlqdajfgism3inyb6313c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-linux-arm64.tar.gz"; + sha256 = "0svvm7icwxi4ly7dsbfsw16m4nkg13ag0j03c3x7amfq80n80zdb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1ad76i2avaaxfhq5bvhdmp3wy2c0zs959i3i1hsda2qdw5c91rjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-linux-arm64.tar.gz"; - sha256 = "13n58572khs758wb091vj3nkrix2kdvjnxkaqwl2ssz669mzys9r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-linux-arm64.tar.gz"; + sha256 = "1zak9vf9dc2y0ic1mi3aakqcv5iabdnzrzxkl1mwxgl2jibmq2n0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-arm64.tar.gz"; @@ -401,20 +401,20 @@ sha256 = "0yjy3i95jsdqwmb7qgixlnhzsr6hiv14jcsydjk9j821zw4xrwpr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-linux-arm64.tar.gz"; - sha256 = "16q5kspbl882sa115lfcb8h8sx1i6lhm14xyzsfkmhznqny3lbv8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-linux-arm64.tar.gz"; + sha256 = "1y931wca5hppiwxya68rj6ymhavw7kkpqd67awpls6f7j4y0wwjl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-arm64.tar.gz"; sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-arm64.tar.gz"; - sha256 = "1cv9y65n4fh3308r2y61n7k6h5531kk9a14qfbix1dmiv9zkg2jc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-linux-arm64.tar.gz"; + sha256 = "0dn0y8hwb7kza27igfwcx3fdy083jpwlbhk4kdnrfl71wf9h7ix2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; - sha256 = "1wkswrjh31m8smlwwl50n7z4pfg7gs0lkis2bqiwlyma2zqdqggr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-linux-arm64.tar.gz"; + sha256 = "1zqlilnayrgazd1ad2fhpqrp9mc3hccm55klhz2skxdh9w8fqk3c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; @@ -437,12 +437,12 @@ sha256 = "08j20ikmfdlgwcrv9csb3fj36cvay0s90yzv0r7p2ma22ganvznj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-arm64.tar.gz"; - sha256 = "0r7zm66p47f0b0f3x219s36mvinwij8jyjqi5jafbvzbrmwfrnmk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-linux-arm64.tar.gz"; + sha256 = "1rrmhwlm7vx8n9p8rymqpwnh7g54k89bj1ywv94v73b4l97vnhm8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-linux-arm64.tar.gz"; - sha256 = "07g8c67mrk2c6zps9d1751y6clb1p883dv6yq5rn2ladsmxh9bxp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-linux-arm64.tar.gz"; + sha256 = "1la6hkcyr1dbqy3pz00wl88v2asbswnidfj1s14gy91gmwdj0593"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "1vrshbjdvn01jm38dq91v38q1m30nvx8siyk2ppx5b3zp5kgdlfl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz"; - sha256 = "1ivbdpls45zjzw4v2hi7g3zfhy0nlnnh026bkzzfnfan1isnpp87"; + 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.3.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-darwin-arm64.tar.gz"; - sha256 = "09b0kk8fmydpc65ysh9drc5ci5pg6md221j45bl9x1011389l9pr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-darwin-arm64.tar.gz"; + sha256 = "1igr2ahjlpcp8m6isz6q19kxjj640rrm6h8sj58b9dr1rm842gsl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz"; @@ -491,8 +491,8 @@ sha256 = "0xqwgc89wgfz8sd0yl6w2qqxlb2hraqdap162sa7gafz6hydfjdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-darwin-arm64.tar.gz"; - sha256 = "1lrb07xzvm2qzrc463pxm18gpn0ql5ww2gc9wkk4l10qf59blij0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-darwin-arm64.tar.gz"; + sha256 = "10640g1azg8h65lf7qk11nh8l0ca236xhjp8yciaypn9b074s4rx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-arm64.tar.gz"; @@ -503,8 +503,8 @@ sha256 = "02v0p3ksv0rlz1fk216fr1q3smnxw3fvzpbd9bichsmp8hids4gq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-darwin-arm64.tar.gz"; - sha256 = "0hbq6gfrl6i3hsqizdhab86w38dr79lgq5q85y8z2dqwpk9vqbdi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-darwin-arm64.tar.gz"; + sha256 = "1wnmbn5dc7py89ycjhyhjg14g78wjsywqiyygc65hj6yz79w4avc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0g1n0vkr1lqny1rgb1pgmsvyr2rc0jsj4j6m0ibgcps6j3g9h207"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-arm64.tar.gz"; - sha256 = "1gzh37b5jmpz3ih7s7r11vx7wpph7pvn3iidy6gckrs9rw9jp7l4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-darwin-arm64.tar.gz"; + sha256 = "0aayd2wx0fyrcqhsm0h29xya9xawfrcylx4485l356xj0jbpdm3b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "0ssvm9dwpiisk1n93a522bcc5ijfqz2c25b1qgjsmlgd93phias4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-darwin-arm64.tar.gz"; - sha256 = "01g98gv3wb467p9ghkjxlcndbxjdmd0rk95adi85mk14cfv2ppfp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-darwin-arm64.tar.gz"; + sha256 = "0n2qjbhaqxdw94ryrq1ma73qfxvms1dvyqjg53ay1zsy889ssbfx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-arm64.tar.gz"; @@ -559,20 +559,20 @@ sha256 = "1lkj6zjzhg7s06p75wia14jjsfqs2wza08m4bbcpc4s99b4p6274"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-darwin-arm64.tar.gz"; - sha256 = "1m1w4qds6jbmpw4xwy87bgf8d4nzv8kj29mdnfqbf3hssvzk2zc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-darwin-arm64.tar.gz"; + sha256 = "06qv3bmmcrv9rxv5xain2rk2grfqij6czy2nqay07bjpy2awzh40"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-arm64.tar.gz"; sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-arm64.tar.gz"; - sha256 = "1a38gi1y1vwvgxhid070hsl7la8wnwxzs8473hm1w12lq9kymh0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-darwin-arm64.tar.gz"; + sha256 = "0y46n3wmpm35kb20wfiy0zgkrqrrrj6axkxwv8nxzgyl2hk7ay17"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; - sha256 = "0x883w9nvvxdsm0knxzzfnnv0lbbysbs04ym681qxzy9pi7ijhj3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-darwin-arm64.tar.gz"; + sha256 = "09z55lszcqym65w80zw1s63vcmvhn810si460w9fdzli0x9gg53n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; @@ -595,12 +595,12 @@ sha256 = "1l0ykg6v6h70197163h5cn1di1ycacrn7j3s23yrphqfdq3xfi4g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-arm64.tar.gz"; - sha256 = "1vzyn88xw94b2kgd0gmvsjz1k7bjvmf9gyynnn2xsmzzs6jmhl1d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-darwin-arm64.tar.gz"; + sha256 = "088kzd3lv32520xb57fsj5r284dnkarlf996cv5jdyrl1750rcd4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-darwin-arm64.tar.gz"; - sha256 = "0gxazn3b65j3wib18pig0a900is05lph38xq06ih80njzb84ajyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-darwin-arm64.tar.gz"; + sha256 = "0s2y6bf283x0vcjj3nrkbbyi0rszlicmdahpjlr8h50w45cg1j44"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "0hh9m53pc07mfpi2zl1hzqg58fh0i6vbm0s9vppxvn2nnl5bd0wy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz"; - sha256 = "1iabwi9cf0pvfhhhxbhp8283bzhd58rwwfcrhgh1wh9kgr0icqlx"; + 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.3.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 0e8fc32925..3481baabe6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "pulumi"; - version = "3.53.1"; + version = "3.54.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; + sdkVendorHash = "sha256-NstNzPKHlN8S+HSpYnG60ZtZtUQsh1Idr8Zz2Ef/jiw="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-5+NwhrALKqyaX6uj1d3Dp3CXWif5/mkL1QgT4pN29bw="; + hash = "sha256-Rl0kh9NCliADfU9Nxc2SwnOIGDilYEeA0rcVCfal5N8="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorSha256 = "sha256-GoRPXbgQqix8FQxQx5oxzeV3+Rfzc02GniGnJS5HJWE="; + vendorSha256 = "sha256-Bkmpw+ZneB1zHmaV4S29LFNoCjB2QmO5nR/iwQQQPpo="; sourceRoot = "${src.name}/pkg"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index cb3614eaf2..84c894a57f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.5"; + version = "0.48.6"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-umgOIjOzx8qUCcZfM3nGYeYDmqmA2ayy2lGAS+nSU2s="; + hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI="; }; - vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo="; + vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index e7d13b20b6..d162774ed5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.69.0"; + version = "0.70.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-nwS5Oar8ck9StNJtbnZoRv3/v/fYKq/RXVl7CPWBfGY="; + hash = "sha256-Dr0kVJk2LyyRFZq1fZBQSLb7z/AfCm8Y+tIMm8JmyJo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-5erZB2CoXVfIK0jYEe0HmdZaeLKLAqOiKi8QAQQFVKU="; + vendorHash = "sha256-UB0ltY4CYlsH4CyQZSOHDH8C9jSCL0TCri33H3oPH/0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index c162521870..e68b565d05 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4="; + sha256 = "sha256-4kjsNaiXnmJk88ivVnpTemOOc/asKrcZLGpO8gtV0J8="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU="; + vendorSha256 = "sha256-qI29Qb8im9Xii83ayG1jZtZsrsAT0JQOcuKOM7VYro0="; excludedPackages = "misc"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix b/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix index fabc4923dd..039c817bdf 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "ACMEv2 client written in plain C with minimal dependencies"; homepage = "https://github.com/ndilieto/uacme"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix index 561567f8b1..ab018fde3d 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper catch2 ]; - buildInputs = [ boost libpng libjpeg zlib openssl libwebp ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ]; postPatch = '' cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index fce137cf3b..4551d8b666 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.01.08"; + version = "2023.02.07"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-PUaGjZFMYwG9BduIgmzhi5DTkGfSN9VtAUkqrAZ2xbo="; + hash = "sha256-/EET65zdkHtVCNMurydskk1CO9pObCfWn7qVGGD9U3M="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/fmtoy/default.nix b/third_party/nixpkgs/pkgs/tools/audio/fmtoy/default.nix index dd3f040213..69a0f570d3 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/fmtoy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/fmtoy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fmtoy"; - version = "unstable-2021-12-24"; + version = "unstable-2022-12-23"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "0de6703b3373eb5bf19fd3deaae889286f330c21"; - sha256 = "0sr6klkmjd2hd2kyb9y0x986d6lsy8bziizfc6cmhkqcq92fh45c"; + rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; + sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; }; postPatch = '' @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vampirefrog/fmtoy"; description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unknown license situation + # Unclear if gpl3Only or gpl3Plus # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.unfree; + license = licenses.gpl3; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix index 411aaece53..5f61a9660f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix @@ -23,71 +23,76 @@ stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath runtimePackages} ''; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ - libjpeg - which - ocamlPackages.ocaml ocamlPackages.findlib - # Mandatory dependencies - ocamlPackages.dtools - ocamlPackages.duppy - ocamlPackages.mm - ocamlPackages.ocaml_pcre - ocamlPackages.menhir ocamlPackages.menhirLib - ocamlPackages.camomile - ocamlPackages.ocurl - ocamlPackages.uri - ocamlPackages.sedlex + strictDeps = true; - # Recommended dependencies - ocamlPackages.ffmpeg - - # Optional dependencies - ocamlPackages.camlimages - ocamlPackages.gd4o - ocamlPackages.alsa - ocamlPackages.ao - ocamlPackages.bjack - ocamlPackages.cry - ocamlPackages.dssi - ocamlPackages.faad - ocamlPackages.fdkaac - ocamlPackages.flac - ocamlPackages.frei0r - ocamlPackages.gstreamer - ocamlPackages.inotify - ocamlPackages.ladspa - ocamlPackages.lame - ocamlPackages.lastfm - ocamlPackages.lilv - ocamlPackages.lo - ocamlPackages.mad - ocamlPackages.magic - ocamlPackages.ogg - ocamlPackages.opus - ocamlPackages.portaudio - ocamlPackages.pulseaudio - ocamlPackages.shine - ocamlPackages.samplerate - ocamlPackages.soundtouch - ocamlPackages.speex - ocamlPackages.srt - ocamlPackages.ssl - ocamlPackages.taglib - ocamlPackages.theora - ocamlPackages.vorbis - ocamlPackages.xmlplaylist - ocamlPackages.posix-time2 - ocamlPackages.tsdl - ocamlPackages.tsdl-image - ocamlPackages.tsdl-ttf - - # Undocumented dependencies - ocamlPackages.graphics - ocamlPackages.cohttp-lwt-unix + nativeBuildInputs = + [ makeWrapper pkg-config which + ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir ]; + buildInputs = [ + libjpeg + + # Mandatory dependencies + ocamlPackages.dtools + ocamlPackages.duppy + ocamlPackages.mm + ocamlPackages.ocaml_pcre + ocamlPackages.menhir ocamlPackages.menhirLib + ocamlPackages.camomile + ocamlPackages.ocurl + ocamlPackages.uri + ocamlPackages.sedlex + + # Recommended dependencies + ocamlPackages.ffmpeg + + # Optional dependencies + ocamlPackages.camlimages + ocamlPackages.gd4o + ocamlPackages.alsa + ocamlPackages.ao + ocamlPackages.bjack + ocamlPackages.cry + ocamlPackages.dssi + ocamlPackages.faad + ocamlPackages.fdkaac + ocamlPackages.flac + ocamlPackages.frei0r + ocamlPackages.gstreamer + ocamlPackages.inotify + ocamlPackages.ladspa + ocamlPackages.lame + ocamlPackages.lastfm + ocamlPackages.lilv + ocamlPackages.lo + ocamlPackages.mad + ocamlPackages.magic + ocamlPackages.ogg + ocamlPackages.opus + ocamlPackages.portaudio + ocamlPackages.pulseaudio + ocamlPackages.shine + ocamlPackages.samplerate + ocamlPackages.soundtouch + ocamlPackages.speex + ocamlPackages.srt + ocamlPackages.ssl + ocamlPackages.taglib + ocamlPackages.theora + ocamlPackages.vorbis + ocamlPackages.xmlplaylist + ocamlPackages.posix-time2 + ocamlPackages.tsdl + ocamlPackages.tsdl-image + ocamlPackages.tsdl-ttf + + # Undocumented dependencies + ocamlPackages.graphics + ocamlPackages.cohttp-lwt-unix + ]; + meta = with lib; { description = "Swiss-army knife for multimedia streaming"; homepage = "https://www.liquidsoap.info/"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix index 9318b22aaf..53261bc6b5 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.5.3"; + version = "1.5.4b"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Iw4n3xcc+589/42SfnAklEWTkgwZKAk84dS8fXXLcvs="; + sha256 = "sha256-SMAllqxfae8bNLBkxsY4OmjoIzxFZ0dwIRYconlNZ18="; }; - cargoSha256 = "sha256-Ss6UUznt9g3XWdeCuMG0y9NxWpGOmHbKsQqOMGOK2jo="; + cargoSha256 = "sha256-vqKKv8eNXkDqcgjlybisSmNBijpvHEKsFAENYjD8zQI="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix index b59016e2c9..a55c830281 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.0.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = version; - sha256 = "sha256-lw+POI47bW66NlmMPJKAkqAYhOnyGaFqcS2cX5LRBbk="; + rev = "refs/tags/v${version}" ; + hash = "sha256-7/10t1yE7Gbs+cyj8I9vJoDeaxEz9Azc2j3f6QCjDGM="; }; # The upstream download script tries to download the models to the diff --git a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index 419ddced72..11498e6c75 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch @@ -1,5 +1,5 @@ diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh -index cf54623..5e9c905 100755 +index 7075080..5e9c905 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh @@ -9,18 +9,6 @@ @@ -16,7 +16,7 @@ index cf54623..5e9c905 100755 - fi -} - --models_path=$(get_script_path) +-models_path="$(get_script_path)" - # Whisper models models=( "tiny.en" "tiny" "base.en" "base" "small.en" "small" "medium.en" "medium" "large-v1" "large" ) diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index 60af9b430a..9de97fe52f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , substituteAll , pkgsi686Linux +, fetchpatch , dbus , meson , ninja @@ -103,6 +104,14 @@ in multiStdenv.mkDerivation rec { # Patch the chainloader to search for libyabridge through NIX_PROFILES ./libyabridge-from-nix-profiles.patch + + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-8.0.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch"; + sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU="; + includes = [ "meson.build" ]; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index dc77b5de40..dcc4caaa63 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.7.2"; + version = "1.7.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU="; + sha256 = "sha256-TNh0laNAyHkIZLC51hzchSIDvsHst2aPxoRdI6Mdr84="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix index ab5ae59977..03d4f70711 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix @@ -28,10 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://bupstash.io"; license = licenses.mit; platforms = platforms.unix; - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ andrewchambers ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix index b5a694482c..dfde510441 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.22"; + version = "0.3.23"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-NSIWuzgv3dQ2Kpl1HOoghrOaKztDjZs8NjF9k41kZQY="; + sha256 = "sha256-na9k26+GDdASZ37n0QtFuRDMtq338QOlXTf0X4raOJI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix index 3b48195d11..be456cf594 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl , linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin , autoreconfHook +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -8,7 +9,9 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) version; +in { pname = "bzip2"; version = "1.0.8"; @@ -53,12 +56,15 @@ stdenv.mkDerivation rec { ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0 ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "High-quality data compression program"; homepage = "https://www.sourceware.org/bzip2"; changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD"; license = licenses.bsdOriginal; + pkgConfigModules = [ "bzip2" ]; platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index eb54f08a3a..f96ee77d93 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-12-29"; + version = "unstable-2023-01-31"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "42cf74fd1d0ef58927967e6236988e86cfc0d086"; - sha256 = "sha256-N/1heStwmB7CzE/ddTud/ywnMdhq8ZkLju+x0UL0yjY="; + rev = "3c39b422acd3346321185be0ce263809e2a9a23f"; + hash = "sha256-2ci/m4JfodLiPoWfP+QCEqlk0k48zq3mKb8Pdrtln0o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix index e7eecbf766..9c38852e4e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix @@ -5,8 +5,8 @@ let patches = [ (fetchpatch { name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; - url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/f45d04854a40cb52ae0e6736916d5955cb68b8ee/patch/btrfs-progs-v5.12.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; - sha256 = "0c7dd44q2ww6k9nk5dh6m0f0wbd8x84vb2m61fk6a44nsv2fwz1x"; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/ecc2664c380616ec75cfc1e600b5514cdff5c687/patch/btrfs-progs-v6.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; + sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; }) ]; }); diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix index 6da75887d5..5a917602c4 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.20.0"; + version = "0.20.5"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-FgVXl986PPaX/6TX7MaXPd+NJ3M94fNGa1hFWUDRP8w="; + sha256 = "sha256-8SizRNjA+lvp8ZD14SoRcymhYmJXlwoeZQjrekIbdL4="; }; - cargoHash = "sha256-uWKSO2odvBeFUcZPGcsEki0PdNVtbVv5g3Dnkxgw2Io="; + cargoHash = "sha256-tXV1G0qWN0jLOKlnZfHHlOZw+wUItLzQtSg4o2f96u0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/kio-admin/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/kio-admin/default.nix new file mode 100644 index 0000000000..7e4a97fa25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/kio-admin/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }: + +stdenv.mkDerivation rec { + pname = "kio-admin"; + version = "1.0.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "system"; + repo = "kio-admin"; + rev = "v${version}"; + hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ qtbase kio ki18n polkit-qt ]; + + meta = with lib; { + description = "Manage files as administrator using the admin:// KIO protocol."; + homepage = "https://invent.kde.org/system/kio-admin"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ k900 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index 898ba9ed3c..55b796ec32 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.116"; + version = "3.0.117"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-/+l4BURvL1R6te6tlXRJx7YBDyYuMrGnzzhMc9XeXKc="; + sha256 = "sha256-6zBMAi9ruPPlcnpdgqwl35QZ5u4MyFPUa70yvGTkHpo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/simple-mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/simple-mtpfs/default.nix new file mode 100644 index 0000000000..3cb2aa9700 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/simple-mtpfs/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, pkg-config +, fuse +, libmtp +}: +stdenv.mkDerivation rec { + pname = "simple-mtpfs"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "phatina"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vAqi2owa4LJK7y7S7TwkPAqDxzyHrZZBTu0MBwMT0gI="; + }; + + nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ]; + buildInputs = [ fuse libmtp ]; + + meta = with lib; { + description = "Simple MTP fuse filesystem driver"; + homepage = "https://github.com/phatina/simple-mtpfs"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index b9eefb0b02..4519ee9d42 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -1,12 +1,12 @@ -{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}: +{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse }: stdenv.mkDerivation rec { pname = "wiimms-iso-tools"; - version = "3.02a"; + version = "3.05a"; src = fetchurl { - url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.tar.bz2"; - sha256 = "074cvcaqz23xyihslc6n64wwxwcnl6xp7l0750yb9pc0wrqxmj69"; + url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.txz"; + hash = "sha256-5aikiPJkZf9OwD8QmQ7ijhBOtFQpkIErvb6gOvEu2L0="; }; buildInputs = [ zlib ncurses fuse ]; @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs setup.sh - patchShebangs gen-template.sh - patchShebangs gen-text-file.sh + patchShebangs setup.sh gen-template.sh gen-text-file.sh + substituteInPlace setup.sh --replace gcc "$CC" + substituteInPlace Makefile --replace gcc "$CC" ''; - # Workaround build failure on -fno-common toolchains like upstream gcc-10. - NIX_CFLAGS_COMPILE = "-Wno-error=format-security -fcommon"; INSTALL_PATH = "$out"; installPhase = '' @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://wit.wiimm.de"; description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ nilp0inter ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/games/alice-tools/default.nix b/third_party/nixpkgs/pkgs/tools/games/alice-tools/default.nix new file mode 100644 index 0000000000..0aed7016fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/alice-tools/default.nix @@ -0,0 +1,106 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, bison +, flex +, libiconv +, libpng +, libjpeg +, libwebp +, zlib +, withGUI ? true +, qtbase ? null +, wrapQtAppsHook ? null +}: + +assert withGUI -> qtbase != null && wrapQtAppsHook != null; + +stdenv.mkDerivation rec { + pname = "alice-tools"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "nunuhara"; + repo = "alice-tools"; + rev = version; + fetchSubmodules = true; + hash = "sha256-uXiNNneAOTDupgc+ZvaeRNbEQFJBv4ppdEc3kZeUsg8="; + }; + + patches = [ + # These two patches (one to alice-tools, one to a subproject) improve DCF & PCF parsing + # Remove them when version > 0.12.1 + (fetchpatch { + url = "https://github.com/nunuhara/alice-tools/commit/c800e85b37998d7a47060f5da4b1782d7201a042.patch"; + excludes = [ "subprojects/libsys4" ]; + hash = "sha256-R5ckFHqUWHdAPkFa53UbVeLgxJg/8qGLTQWwj5YRJc4="; + }) + (fetchpatch { + url = "https://github.com/nunuhara/libsys4/commit/cff2b826d1618fb17616cdd288ab0c50f35e8032.patch"; + stripLen = 1; + extraPrefix = "subprojects/libsys4/"; + hash = "sha256-CmetiVP2kGL+MwuE9OoEDrDFxzwWvv1TtZuq1li1uIw="; + }) + ]; + + postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") '' + substituteInPlace src/meson.build \ + --replace qt5 qt6 + ''; + + mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [ + # Qt6 requires at least C++17, project uses compiler's default, default too old on Darwin & aarch64-linux + "-Dcpp_std=c++17" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + bison + flex + ] ++ lib.optionals withGUI [ + wrapQtAppsHook + ]; + + buildInputs = [ + libiconv + libpng + libjpeg + libwebp + zlib + ] ++ lib.optionals withGUI [ + qtbase + ]; + + dontWrapQtApps = true; + + # Default install step only installs a static library of a build dependency + installPhase = '' + runHook preInstall + + install -Dm755 src/alice $out/bin/alice + '' + lib.optionalString withGUI '' + install -Dm755 src/galice $out/bin/galice + wrapQtApp $out/bin/galice + '' + '' + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Tools for extracting/editing files from AliceSoft games"; + homepage = "https://github.com/nunuhara/alice-tools"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = if withGUI then "galice" else "alice"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix b/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix index cd18b8b09d..ad7fc339fe 100644 --- a/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix @@ -1,13 +1,13 @@ { lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "joystickwake"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "foresto"; repo = pname; - rev = "v${version}"; - sha256 = "0f990bvykjjq2rzzbm158kajnqxigfzcrzap11dc415wkvn25k6q"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0rVVxaaAFHkmJeG3e181x7faTIeFwupplWepoyxc51g="; }; propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index 13e8705f76..64e4a49445 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation rec { pname = "agi"; - version = "3.2.1"; + version = "3.3.0"; src = fetchzip { url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-wguQERJ5Zvcodk7QMtloCwI4qYmatmHCFhgArbS07EA="; + sha256 = "sha256-vKq1pe4Z0blSvNgez+/MP2rA0+QfCyr3RsCGX4GMR08="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index 310045cd23..0e9b83e456 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-FIskGHamKYYUtYmgwh7dS+bs2UPWIyBiviPkDAbVY+0="; + sha256 = "sha256-BtSe14LWb7v+I0V75C1Ej+klZVU22L6FQfNUPp27IQQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix index 2c486b4753..4004be69ff 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-CkZxxMoV2cqyh4ck81ODPxTYuSeQ8Q33a/4lL7UOfIY="; + hash = "sha256-9MDmeHid/faHeBjBfPgpRMjMMXZeHKP0VZZJtEQgBhs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix index f48fcd4a45..db546583f3 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OEknK4uLINui6U+mz0P9K36pEzfx+TevGvLqM0RXkSM="; + sha256 = "sha256-ppBJx3Yax2w8/D9DQayS+jfqFP1sa9pdVGeAHExg+9Y="; }; - cargoSha256 = "sha256-L3Km+VIoIun1wjKyJ3dscK5PSfQVR7qyjU6y1j9quSg="; + cargoHash = "sha256-l/Ytlzyoo27geZZ7wFYHStqD6TvMuI4SC0+DYjTK57w="; meta = with lib; { description = "An SVG rendering library"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 73344ca269..497a4abc59 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "evdevremapkeys"; - version = "0.1.0"; + version = "unstable-2021-05-04"; src = fetchFromGitHub { owner = "philipl"; repo = pname; - rev = "68fb618b8142e1b45d7a1e19ea9a5a9bbb206144"; - sha256 = "0c9slflakm5jqd8s1zpxm7gmrrk0335m040d7m70hnsak42jvs2f"; + rev = "9b6f372a9bdf8b27d39f7e655b74f6b9d1a8467f"; + sha256 = "sha256-FwRbo0RTiiV2AB7z6XOalMnwMbj15jM4Dxs41TsIOQI="; }; propagatedBuildInputs = with python3Packages; [ @@ -16,6 +16,7 @@ python3Packages.buildPythonPackage rec { pyxdg python-daemon evdev + pyudev ]; # hase no tests diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix index 298de6a641..ff9786cfe3 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-oz3+hNNjQ/5vXWPMuhA2N2KK8W8S42WeSeDbhV4oJ9M="; + sha256 = "sha256-/0XeFW0cdS1/UaE/z2FROwk2dTyZMqXjiBzt62x8f8o="; }; patches = lib.optionals withPantheon [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix index 5c7c488af8..d95efa0dbd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-qp9K0lF7joFhfepncUoHvekMS+fZcPaBrsWY2DKmIUs="; + sha256 = "sha256-svEk+IFttkCXmoAOFH3k2rRC/OL9HXOLiuGrCh10YNc="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdfresize/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdfresize/default.nix index f1ac559fb6..ef3ffc873a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdfresize/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdfresize/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Tool to resize BDF fonts"; homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix index 0add7340ed..2e5ebd1e56 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml perl ]; meta = with lib; { description = "A collection of tools for translating from BibTeX to HTML"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index c920aebd32..257e75628e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-pg+eHmClDd04tWljQUS0IRyMzkHnkpkofuhz/KyQbWo="; + hash = "sha256-+bOdUjBMxYT4qbZ8g5l0pDZJhXaeuYVygb13sx7mg28="; }; - cargoHash = "sha256-+RUYC39L7yyh1xYPfZn7tDIf1cmmBuGcqTNibFk7s6M="; + cargoHash = "sha256-r/oj5ZgBjJXowFa95GKPACruH3bnPHjjyaSRewogXHQ="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix index a386853247..2d81a940dd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "coinlive"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mayeranalytics"; repo = pname; rev = "v${version}"; - hash = "sha256-i21C1ZSAPoUOBlnDQl40/17yRqmNx3wkjswHJeV9vko="; + hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; }; - cargoSha256 = "sha256-0pUXCY5rZWh26KGD2OU2+M9L0RtCIan6hmuNeIeBEHI="; + cargoSha256 = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4="; nativeBuildInputs = [ pkg-config @@ -30,6 +30,11 @@ rustPlatform.buildRustPackage rec { Security ]; + checkFlags = [ + # requires network access + "--skip=utils::test_get_infos" + ]; + meta = with lib; { description = "Live cryptocurrency prices CLI"; homepage = "https://github.com/mayeranalytics/coinlive"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index 0ace2196ed..0a4577b9f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.19.0"; + version = "2.19.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-cb2WW0FpY5GMzll7sgbDRcgiKYSVZjJ8e8BabywF9wg="; + sha256 = "sha256-GNVmrFY/qWInP0qT9Y+UurIyK3rBhj2OyAcH+Sw3smo="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-79dUeQOf6hiSRzz5mLWcSP5bLXMOU5YcE9ecd/t9VaI="; + cargoHash = "sha256-xhNHvTVOBwAkMn/lLUShhZkBih1zX5b/udeJaEcZGgs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix index c0c8a2a547..a162e70560 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "eget"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahmvsSBR/WhKhBSMc+GE3RfuGK6wJIKSvqXPcff1HAI="; + sha256 = "sha256-tUHA5LbTOz20ydMM8141VjCUBsxI+Wzkgfh27aq/2y4="; }; vendorSha256 = "sha256-J8weaJSC+k8BnijG2Jm2GYUZmEhASrrCDxb46ZGmCMI="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/f2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/f2/default.nix index 943ce72cc6..48b14b8670 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/f2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/f2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "f2"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ayoisaiah"; repo = "f2"; rev = "v${version}"; - sha256 = "sha256-bNcPzvjVBH7x60kNjlUILiQGG3GDmqIB5T2WP3+nZ+s="; + sha256 = "sha256-2+wp9hbPDH8RAeQNH1OYDfFlev+QTsEHixYb/luR9F0="; }; - vendorSha256 = "sha256-Cahqk+7jDMUtZq0zhBll1Tfryu2zSPBN7JKscV38360="; + vendorHash = "sha256-sOTdP+MuOH9jB3RMajeUx84pINSuWVRw5p/9lrOj6uo="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index 18ffdb71cd..6d96c33e5e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jg2rMiFXtN3oLru1gTaTyIo5eBEI23paKJiDV6KZZE4="; + sha256 = "sha256-9qvIxKg/fj08wYY2fK5J1nWzojStUb9ArXwvA/cTOcQ="; }; - cargoHash = "sha256-9Gri/EBaUiCpFBL0f132JDD4Zl5v40e8JmlRvm019S4="; + cargoHash = "sha256-kVnA8w2YVg6+h1V1O4cvciuB7GM4/LULFsGrzy8xUMQ="; nativeBuildInputs = [ pandoc installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index 50f51cfd71..4cd81c8c64 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.13.3"; + version = "5.13.4"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ="; + hash = "sha256-W+9KmKZ1bPfQfv1DXCJrIswriw4ivBVZPW81tfvRBc0="; }; udevRules = fetchurl { @@ -47,7 +47,7 @@ in appimageTools.wrapAppImage { ''; meta = { - description = "Configure FLEXOPTIX Universal Transcievers in seconds"; + description = "Configure FLEXOPTIX Universal Transceivers in seconds"; homepage = "https://www.flexoptix.net"; changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog"; license = lib.licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix index ba9117a297..77be76f2d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-JA9bvRb8u0qG6ZsQR9qJ3yaV9ni/MkdWo9xRtmPp92I="; + sha256 = "sha256-fCS6cSD3w2EbLL1yNfH+NKxswRUY4zyCR07gKGXW4Yc="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index cb53f45173..eeca15dddd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVvkASYNp6GSCEIWfZwZ1rtOkUCutccOWCkt47rmgyE="; + sha256 = "sha256-cLbAxF1g+N6XcpZS5+jDTykkbXoK7seKEmhCkp6noo8="; }; - vendorSha256 = "sha256-jFItDgmjjKbmTpOn32V1K3AmYyYCrc5RqMAH/X+VWTM="; + vendorSha256 = "sha256-VpmSTNO3XgZpOu2OToq5HUJTagX9Hg7a65Cqgr8IlkU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix index 3b11dfcb64..a3bb87d56c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.34.0"; - vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ="; + version = "2.34.1"; + vendorHash = "sha256-0C2uUq8GKM3IMjhH30Fa702uDmXbVbEDWJ6wKIWYTQw="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ="; + sha256 = "sha256-7jkhr6fav7YwwFyO3m6mj2jl3RoX3sbS4YBBeMT/Go8="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/kakoune-cr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kakoune-cr/default.nix index 3d71482d4e..9a9fa5c916 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kakoune-cr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kakoune-cr/default.nix @@ -44,7 +44,7 @@ crystal.buildCrystalPackage rec { homepage = "https://github.com/alexherbo2/kakoune.cr"; description = "A command-line tool for Kakoune"; license = licenses.unlicense; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix index 02e783fa1e..ef31e582f5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-P/MxIehxj+FE5hvWge7Q2EwL57ObV8ibRZtmko0mphY="; + sha256 = "sha256-GSjS/6wetm3kHXdGyeenzALZ3tVi7BMM/GLS1ZhMQas="; }; - cargoSha256 = "sha256-dQDfL5yN2ufFpQCXZ5Il0Qzhb/d7FETCVJg3DOMJPWQ="; + cargoHash = "sha256-dgbi0mUI8WqqXF1VNOTbHuCKcvb4B18/1vBlJZ8Jivs="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index dd0d34f50f..2b9ba694d3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation { pname = "ldapvi"; - version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; + version = "unstable-2012-04-28"; # use latest git, it includes some important patches since 2007 release src = fetchgit { url = "http://www.lichteblau.com/git/ldapvi.git"; + rev = "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40"; sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix index 18efb8c952..6070bfb2fa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin ''; - buildInputs = [ + strictDeps = true; + + nativeBuildInputs = [ ocaml camlp5 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/less/default.nix b/third_party/nixpkgs/pkgs/tools/misc/less/default.nix index a7212ccf76..19f4c45596 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/less/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/less/default.nix @@ -1,18 +1,41 @@ -{ lib, stdenv, fetchurl, ncurses, lessSecure ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, ncurses +, pcre2 +}: stdenv.mkDerivation rec { pname = "less"; version = "608"; + # Only tarballs on the website are valid releases, + # other versions, e.g. git tags are considered snapshots. src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; - sha256 = "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6"; + hash = "sha256-ppq+LgoSZ3fgIdO3OqMiLhsmHxDmRiTUHsB5aFpqwgk="; }; - configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. - ++ lib.optionals lessSecure [ "--with-secure" ]; + patches = [ + (fetchpatch { + # https://github.com/advisories/GHSA-5xw7-xf7p-gm82 + name = "CVE-2022-46663.patch"; + url = "https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch"; + hash = "sha256-gWgCzoMt1WyVJVKYzkMq8HfaTlU1XUtC8fvNFUQT0sI="; + }) + ]; - buildInputs = [ ncurses ]; + configureFlags = [ + # Look for ‘sysless’ in /etc. + "--sysconfdir=/etc" + "--with-regex=pcre2" + ]; + + buildInputs = [ + ncurses + pcre2 + ]; meta = with lib; { homepage = "https://www.greenwoodsoftware.com/less/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 88f9a81561..347d6eae7c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,13 +1,10 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, secp256k1 }: -let +stdenv.mkDerivation rec { pname = "libbitcoin"; version = "3.6.0"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = pname; repo = pname; @@ -34,7 +31,6 @@ in stdenv.mkDerivation { homepage = "https://libbitcoin.info/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; - # AGPL with a lesser clause license = licenses.agpl3; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix index 5a68c7697c..211df2186f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE"; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo"; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index a2dae74457..547bbba890 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.01"; + version = "6.10"; src = fetchFromGitHub { owner = "memtest86plus"; repo = "memtest86plus"; rev = "v${finalAttrs.version}"; - hash = "sha256-BAY8hR8Sl9Hp9Zps0INL43cNqJwXX689m9rfa4dHrqs="; + hash = "sha256-f40blxh/On/mC4m+eLNeWzdYzYoYpFOSBndVnREx68U="; }; # Binaries are booted directly by BIOS/UEFI or bootloader diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix index 5b154c8c9a..12bab29944 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jvQCXSdEw8xQ8m2xBLDu7pw9K51lAH3nzCr2N0/+Kuw="; + sha256 = "sha256-V+9TSzCwBITpG7j3mOyPMQN1VwYSPRFgOBPiF3LZVmk="; }; - vendorSha256 = "sha256-rosoPXNb3NYI5mM0gt3Fpg2XZtSLt90jxcBqALx7Lno="; + vendorHash = "sha256-m6XCXwns2if7Odhc2nFbXbGhif4vElrVjcBX0DULkCE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix index 9154c1eabb..4a6cb10b60 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-AJHmHTkKHd99GCBlVv2t8Q9kUlCtOcK+ukYzEs5U3S4="; + hash = "sha256-TtH0sfWFWe3oYK/8jJslqjrEY5rR7HGAVDD5iQ2+spY="; }; - cargoSha256 = "sha256-0QUuYNzKN8dbGiJq2JxElR39zIlqvHXjPzT1dGc6cRM="; + cargoSha256 = "sha256-vwLlqRjiJU3ecLURAZabmIBivYW1zAfMLUhaJzh57ig="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 0429e85433..0ad5b06011 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -1,34 +1,299 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python3, git +{ lib +, stdenv +, autoconf +, automake +, bash +, curl +, fetchFromGitHub +, fetchMavenArtifact +, fetchurl +, git +, jdk8 +, makeWrapper +, nettools +, python3 }: -let jdk = jdk8; jre = jdk8.jre; in - -stdenv.mkDerivation rec { +let + jdk = jdk8; + jre = jdk8.jre; + artifacts = { + apache = [ + (fetchMavenArtifact { + groupId = "org.apache.commons"; + artifactId = "commons-math3"; + version = "3.4.1"; + hash = "sha256-0QdbFKcQhwOLC/0Zjw992OSbWzUp2OLrqZ59nrhWXks="; + }) + ]; + guava = [ + (fetchMavenArtifact { + groupId = "com.google.guava"; + artifactId = "guava"; + version = "18.0"; + hash = "sha256-1mT7/APS5c6cqypE+wHx0L+d/r7MwaRzsfnqMfefb5k="; + }) + ]; + gwt = [ + (fetchMavenArtifact { + groupId = "com.google.gwt"; + artifactId = "gwt-dev"; + version = "2.6.0"; + hash = "sha256-4MLdI7q5fkftHTMoN7W3l5zsq1QB2R/8bF86vEqBI+A="; + }) + (fetchMavenArtifact { + groupId = "com.google.gwt"; + artifactId = "gwt-user"; + version = "2.6.0"; + hash = "sha256-HR5/aopn605inHeENNHBAqKrjkvIl9wPDM+nOwOpiEg="; + }) + (fetchMavenArtifact { + groupId = "net.opentsdb"; + artifactId = "opentsdb-gwt-theme"; + version = "1.0.0"; + hash = "sha256-JJsjcRlQmIrwpOtMweH12e/Ut5NG8R50VPiOAMMGEdc="; + }) + ]; + hamcrest = [ + (fetchMavenArtifact { + url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; + groupId = "org.hamcrest"; + artifactId = "hamcrest-core"; + version = "1.3"; + hash = "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok="; + }) + ]; + hbase = [ + (fetchMavenArtifact { + groupId = "org.hbase"; + artifactId = "asynchbase"; + version = "1.8.2"; + hash = "sha256-D7mKprHMW23dE0SzdNsagv3Hp2G5HUN7sKfs1nVzQF4="; + }) + ]; + jackson = [ + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-annotations"; + version = "2.9.5"; + hash = "sha256-OKDkUASfZDVwrayZiIqjSA7C3jhXkKcJaQi/Q7/AhdY="; + }) + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-core"; + version = "2.9.5"; + hash = "sha256-or66oyWtJUVbAhScZ+YFI2en1/wc533gAO7ShKUhTqw="; + }) + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-databind"; + version = "2.9.5"; + hash = "sha256-D7TgecEY51LMlMFa0i5ngrDfxdwJFF9IE/s52C5oYEc="; + }) + ]; + javacc = [ + (fetchMavenArtifact { + groupId = "net.java.dev.javacc"; + artifactId = "javacc"; + version = "6.1.2"; + hash = "sha256-7Qxclglhz+tDE4LPAVKCewEVZ0fbN5LRv5PoHjLCBKs="; + }) + ]; + javassist = [ + (fetchMavenArtifact { + groupId = "org.javassist"; + artifactId = "javassist"; + version = "3.21.0-GA"; + hash = "sha256-eqWeAx+UGYSvB9rMbKhebcm9OkhemqJJTLwDTvoSJdA="; + }) + ]; + jexl = [ + (fetchMavenArtifact { + groupId = "commons-logging"; + artifactId = "commons-logging"; + version = "1.1.1"; + hash = "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8="; + }) + (fetchMavenArtifact { + groupId = "org.apache.commons"; + artifactId = "commons-jexl"; + version = "2.1.1"; + hash = "sha256-A8mp+uXaeM5SwL8kRnzDc1W34jGW3/SDniwP8BigEwY="; + }) + ]; + jgrapht = [ + (fetchMavenArtifact { + groupId = "org.jgrapht"; + artifactId = "jgrapht-core"; + version = "0.9.1"; + hash = "sha256-5u8cEVaJ7aCBQrhtUkYg2mQ7bp8BNAUletB/QtxcaXg="; + }) + ]; + junit = [ + (fetchMavenArtifact { + groupId = "junit"; + artifactId = "junit"; + version = "4.11"; + hash = "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4="; + }) + ]; + kryo = [ + (fetchMavenArtifact { + groupId = "org.ow2.asm"; + artifactId = "asm"; + version = "4.0"; + hash = "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.kryo"; + artifactId = "kryo"; + version = "2.21.1"; + hash = "sha256-adEG73euU3sZBp9WUQNLZBN6Y3UAZXTAxjsuvDuy7q4="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.minlog"; + artifactId = "minlog"; + version = "1.2"; + hash = "sha256-pnjLGqj10D2QHJksdXQYQdmKm8PVXa0C6E1lMVxOYPI="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.reflectasm"; + artifactId = "reflectasm"; + version = "1.07"; + classifier = "shaded"; + hash = "sha256-CKcOrbSydO2u/BGUwfdXBiGlGwqaoDaqFdzbe5J+fHY="; + }) + ]; + logback = [ + (fetchMavenArtifact { + groupId = "ch.qos.logback"; + artifactId = "logback-classic"; + version = "1.0.13"; + hash = "sha256-EsGTDKkWU0IqxJ/qM/zovhsfzS0iIM6jg8R5SXbHQY8="; + }) + (fetchMavenArtifact { + groupId = "ch.qos.logback"; + artifactId = "logback-core"; + version = "1.0.13"; + hash = "sha256-7NjyT5spQShOmPFU/zND5yDLMcj0e2dVSxRXRfWW87g="; + }) + ]; + mockito = [ + (fetchMavenArtifact { + groupId = "org.mockito"; + artifactId = "mockito-core"; + version = "1.9.5"; + hash = "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o="; + }) + ]; + netty = [ + (fetchMavenArtifact { + groupId = "io.netty"; + artifactId = "netty"; + version = "3.10.6.Final"; + hash = "sha256-h2ilD749k6iNjmAA6l1o4w9Q3JFbN2TDxYcPcMT7O0k="; + }) + ]; + objenesis = [ + (fetchMavenArtifact { + groupId = "org.objenesis"; + artifactId = "objenesis"; + version = "1.3"; + hash = "sha256-3U7z0wkQY6T+xXjLsrvmwfkhwACRuimT3Nmv0l/5REo="; + }) + ]; + powermock = [ + (fetchMavenArtifact { + groupId = "org.powermock"; + artifactId = "powermock-mockito-release-full"; + version = "1.5.4"; + classifier = "full"; + hash = "sha256-GWXaFG/ZtPlc7uKrghQHNAPzEu2k5VGYCYTXIlbylb4="; + }) + ]; + protobuf = [ + (fetchMavenArtifact { + groupId = "com.google.protobuf"; + artifactId = "protobuf-java"; + version = "2.5.0"; + hash = "sha256-4MHGRXXABWAXJefGoCzr+eEoXoiPdWsqHXP/qNclzHQ="; + }) + ]; + slf4j = [ + (fetchMavenArtifact { + groupId = "org.slf4j"; + artifactId = "log4j-over-slf4j"; + version = "1.7.7"; + hash = "sha256-LjcWxCtsAm/jzd2pK7oaVZsTZjjcexj7qKQSxBiVecI="; + }) + (fetchMavenArtifact { + groupId = "org.slf4j"; + artifactId = "slf4j-api"; + version = "1.7.7"; + hash = "sha256-aZgMA4yhsTGSZWFZFhfZwl+r/Hspgor5FZfKhXDPNf4="; + }) + ]; + suasync = [ + (fetchMavenArtifact { + groupId = "com.stumbleupon"; + artifactId = "async"; + version = "1.4.0"; + hash = "sha256-FJ1HH68JOkjNtkShjLTJ8K4NO/A/qu88ap7J7SEndrM="; + }) + ]; + validation-api = [ + (fetchMavenArtifact { + groupId = "javax.validation"; + artifactId = "validation-api"; + version = "1.0.0.GA"; + hash = "sha256-5FnzE+vG2ySD+M6q05rwcIY2G0dPqS5A9ELo3l2Yldw="; + }) + (fetchMavenArtifact { + groupId = "javax.validation"; + artifactId = "validation-api"; + version = "1.0.0.GA"; + classifier = "sources"; + hash = "sha256-o5TVKpt/4rsU8HGNKzyDCP/o836RGVYBI5jVXJ+fm1Q="; + }) + ]; + zookeeper = [ + (fetchMavenArtifact { + groupId = "org.apache.zookeeper"; + artifactId = "zookeeper"; + version = "3.4.6"; + hash = "sha256-ijdaHvmMvA4fbp39DZbZFLdNN60AtL+Bvrd/qPNNM64="; + }) + ]; + }; +in stdenv.mkDerivation rec { pname = "opentsdb"; - version = "2.4.0"; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; + src = fetchFromGitHub { + owner = "OpenTSDB"; + repo = "opentsdb"; + rev = "refs/tags/v${version}"; + hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-35476.patch"; - url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; - sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; - }) + nativeBuildInputs = [ + autoconf + automake + makeWrapper ]; - nativeBuildInputs = [ makeWrapper autoconf automake ]; buildInputs = [ curl jdk nettools python3 git ]; preConfigure = '' + chmod +x build-aux/fetchdep.sh.in patchShebangs ./build-aux/ ./bootstrap ''; + preBuild = lib.concatStrings (lib.mapAttrsToList (dir: lib.concatMapStrings (artifact: '' + ln -s ${artifact}/share/java/* third_party/${dir} + '')) artifacts); + postInstall = '' wrapProgram $out/bin/tsdb \ --set JAVA_HOME "${jre}" \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix index 68d89d1a6e..251cf113c4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, bash, buildGoModule, fetchFromGitHub, getent, stdenv }: +{ lib, bash, buildGoModule, fetchFromGitHub, getent, nix-update-script, stdenv }: buildGoModule rec { pname = "otel-cli"; - version = "0.0.20"; + version = "0.1.0"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-bWdkuw0uEE75l9YCo2Dq1NpWXuMH61RQ6p7m65P1QCE="; + hash = "sha256-iYlyokBAS5KQUYq83zhKWH/Vulq7prQdceFpeBJN2PI="; }; - vendorHash = "sha256-IJ2Gq5z1oNvcpWPh+BMs46VZMN1lHyE+M7kUinTSRr8="; + vendorHash = "sha256-5c5uDp5KVo/DYAM5F76ivtT52+lNBheVmjAjmq6EJFk="; preCheck = '' ln -s $GOPATH/bin/otel-cli . @@ -20,6 +20,8 @@ buildGoModule rec { --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`' ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { homepage = "https://github.com/equinix-labs/otel-cli"; description = "A command-line tool for sending OpenTelemetry traces"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pandoc-katex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pandoc-katex/default.nix index 6a56651221..fdcfef8784 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pandoc-katex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pandoc-katex/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pandoc-katex"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "xu-cheng"; repo = pname; rev = version; - hash = "sha256-TGilWr/Q8K+YP6FYfZqJOwtTAFiY+YX7AAole4TiSoE="; + hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM="; }; - cargoSha256 = "sha256-CEyS7dMG+5e/LwEKdYlHFVCBm2FPKVjJlrMFB+QGm+Y="; + cargoHash = "sha256-Qf+QYOIBmSgax7p5K32SkaDT0MoKUY4TkxLbf/ZbM+U="; meta = with lib; { description = "Pandoc filter to render math equations using KaTeX"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parcellite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parcellite/default.nix index 615e9e528d..04fe534984 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parcellite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parcellite/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook , gtk2, hicolor-icon-theme, intltool, pkg-config -, which, wrapGAppsHook, xdotool }: +, which, wrapGAppsHook, xdotool, libappindicator-gtk2 }: stdenv.mkDerivation rec { pname = "parcellite"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor-icon-theme ]; + buildInputs = [ gtk2 hicolor-icon-theme libappindicator-gtk2 ]; NIX_LDFLAGS = "-lgio-2.0"; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index af19108ff2..05367d2e52 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+LLAZeK4sV7oEeN3zNqWBkbCLaaGgJMLidZqlTQeymo="; + sha256 = "sha256-Uwi21dNhpDhrcLS2Ra0vaRsvdqEz7FX7SPILeq12ZnE="; }; - vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY="; + vendorHash = "sha256-BGm3LvKOtlba/BtZ4Ue3Tzphlj5ZSqSzXTF8gSgRYEU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index aeb978ec31..18c48f2b15 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-6pt8WjfSt458FIK/cCzEOM9mFruFY6jBnkXoRWIhOr0="; + sha256 = "sha256-MX4na74T8+6As8e+izWz1O+xhNGfS2EKUT6goqy+sms="; }; - vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08="; + vendorHash = "sha256-Sfjp8EQeTlXayYSBO72KWLj+CScNUM5O49AP1qEfQTw="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 6b3f42e377..a016fb08e3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.0"; + version = "1.2023.1"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-1hP+HJCI1HCqd0qJCthac7cMiEnyUPz1M7fvF8AXh08="; + sha256 = "sha256-ObNiuD0le5FOEGvaIr3jl+Lix74Xvpso/YIqyHGGHAs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pokemonsay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pokemonsay/default.nix index f61b93a874..7053e4ba80 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pokemonsay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pokemonsay/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , cowsay , coreutils , findutils @@ -8,15 +9,23 @@ stdenvNoCC.mkDerivation rec { pname = "pokemonsay"; - version = "unstable-2021-10-05"; + version = "1.0.0"; src = fetchFromGitHub { owner = "HRKings"; repo = "pokemonsay-newgenerations"; - rev = "baccc6d2fe1897c48f60d82ff9c4d4c018f5b594"; + rev = "v${version}"; hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g="; }; + patches = [ + (fetchpatch { # https://github.com/HRKings/pokemonsay-newgenerations/pull/5 + name = "word-wrap-fix.patch"; + url = "https://github.com/pbsds/pokemonsay-newgenerations/commit/7056d7ba689479a8e6c14ec000be1dfcd83afeb0.patch"; + hash = "sha256-aqUJkyJDWArLjChxLZ4BbC6XAB53LAqARzTvEAxrFCI="; + }) + ]; + postPatch = '' substituteInPlace pokemonsay.sh \ --replace \ @@ -51,8 +60,11 @@ stdenvNoCC.mkDerivation rec { cp pokemons/*.cow $out/share/pokemonsay ''; - checkPhase = '' - $out/bin/pokemonsay --list-pokemon + doInstallCheck = true; + installCheckPhase = '' + (set -x + test "$($out/bin/pokemonsay --list | wc -l)" -ge 891 + ) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix index 8adb5a02f8..593ff2c68b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix @@ -61,7 +61,8 @@ buildPythonPackage rec { libiconv ]; - doCheck = true; + # i686-linux: dotnet-sdk not available + doCheck = stdenv.buildPlatform.system != "i686-linux"; postPatch = '' substituteInPlace pre_commit/resources/hook-tmpl \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix index 144038f60f..2c5403d4a1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix @@ -12,22 +12,18 @@ python3.pkgs.buildPythonApplication rec { pname = "qmk"; version = "1.1.1"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; + hash = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; }; nativeBuildInputs = with python3.pkgs; [ - nose2 - setuptools-scm - yapf + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ - appdirs - argcomplete - colorama dotty-dict hid hjson @@ -50,14 +46,6 @@ python3.pkgs.buildPythonApplication rec { pkgsCross.avr.libcCross ]; - # buildPythonApplication requires setup.py; the setup.py file crafted below - # acts as a wrapper to setup.cfg - postConfigure = '' - touch setup.py - echo "from setuptools import setup" >> setup.py - echo "setup()" >> setup.py - ''; - # no tests implemented doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index e21842e360..d5d86c1985 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanslub42/rlwrap"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 srapenne ]; + maintainers = with maintainers; [ srapenne ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix index 6ca75c64f5..9a3c350b79 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.1.0"; + version = "5.2.2"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-cD+xq2LVaTZGjFj+SleQlNT3sAV6N4nG4RVbH015OOA="; + sha256 = "sha256-kdntnzGpu1NUP6rrBaH7ASwE7XT18vHcgf39bp5A4ds="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock index fc30e71aaf..705cf9f90d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock @@ -7,6 +7,27 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" 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== + dependencies: + "@babel/highlight" "^7.18.6" + +"@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/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@develar/schema-utils@~2.6.5": version "2.6.5" resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" @@ -15,21 +36,20 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== +"@electron/get@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" + integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" - got "^9.6.0" + got "^11.8.5" progress "^2.0.3" semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" "@electron/universal@1.2.1": version "1.2.1" @@ -44,10 +64,10 @@ minimatch "^3.0.4" plist "^3.0.4" -"@fortawesome/fontawesome-free@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" - integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== +"@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== "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" @@ -66,23 +86,33 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== dependencies: - defer-to-connect "^1.0.1" + defer-to-connect "^2.0.0" "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@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" @@ -105,6 +135,18 @@ "@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" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== + +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" + "@types/minimatch@*": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" @@ -116,14 +158,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.11.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz#78a6d7ec962b596fc2d2ec102c4dd3ef073fea6a" - integrity sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A== + version "18.11.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d" + integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw== "@types/node@^16.11.26": - version "16.11.68" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c" - integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ== + version "16.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65" + integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw== "@types/plist@^3.0.1": version "3.0.2" @@ -133,6 +175,13 @@ "@types/node" "*" xmlbuilder ">=11.0.1" +"@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" + "@types/verror@^1.10.3": version "1.10.6" resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" @@ -144,9 +193,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" - integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== + 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" "*" @@ -184,6 +233,13 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -280,10 +336,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.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== +axios@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3" + integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -325,10 +381,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.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0" - integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ== +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== brace-expansion@^1.1.7: version "1.1.11" @@ -417,18 +473,37 @@ builder-util@23.6.0: stat-mode "^1.0.0" temp-file "^3.4.0" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== +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== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" http-cache-semantics "^4.0.0" - keyv "^3.0.0" + keyv "^4.0.0" lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + normalize-url "^6.0.1" + responselike "^2.0.0" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" chalk@^4.0.2, chalk@^4.1.1: version "4.1.2" @@ -454,9 +529,9 @@ chromium-pickle-js@^0.2.0: integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" - integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== + version "3.7.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" + integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== cli-truncate@^2.1.0: version "2.1.0" @@ -491,6 +566,13 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -498,6 +580,11 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -537,19 +624,21 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -config-chain@^1.1.11: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - 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== + dependencies: + import-fresh "^3.2.1" + js-yaml "^4.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + crc@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" @@ -598,13 +687,6 @@ debug@^2.6.8: dependencies: ms "2.0.0" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== - dependencies: - mimic-response "^1.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" @@ -617,10 +699,10 @@ 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== -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +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" @@ -645,10 +727,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.1045489: - version "0.0.1045489" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz#f959ad560b05acd72d55644bc3fb8168a83abf28" - integrity sha512-D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ== +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" @@ -698,11 +780,6 @@ dotenv@^9.0.2: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== -duplexer3@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" - integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== - ejs@^3.1.7: version "3.1.8" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" @@ -753,12 +830,12 @@ electron-publish@23.6.0: lazy-val "^1.0.5" mime "^2.5.2" -electron@^21.0.1: - version "21.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz#8eb65d69b36aa8dac0ee7330eab70181df211c8b" - integrity sha512-oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg== +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== dependencies: - "@electron/get" "^1.14.1" + "@electron/get" "^2.0.0" "@types/node" "^16.11.26" extract-zip "^2.0.1" @@ -767,11 +844,6 @@ 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== -encodeurl@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - 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" @@ -784,6 +856,13 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -794,6 +873,11 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -932,15 +1016,15 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.3" -get-stream@^4.0.0, get-stream@^4.1.0: +get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== @@ -983,16 +1067,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - globalthis@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" @@ -1000,22 +1074,22 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== +got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" @@ -1027,6 +1101,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -1059,9 +1138,9 @@ hosted-git-info@^4.1.0: lru-cache "^6.0.0" http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + 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== http-proxy-agent@^5.0.0: version "5.0.0" @@ -1072,6 +1151,14 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "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" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -1100,6 +1187,14 @@ ieee754@^1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== +import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1113,11 +1208,16 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.4, ini@~1.3.0: +ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" @@ -1179,6 +1279,11 @@ jake@^10.8.5: filelist "^1.0.1" minimatch "^3.0.4" +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -1186,10 +1291,15 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== json-schema-traverse@^0.4.1: version "0.4.1" @@ -1202,9 +1312,9 @@ json-stringify-safe@^5.0.1: integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json5@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^4.0.0: version "4.0.0" @@ -1230,28 +1340,28 @@ keytar@^7.9.0: node-addon-api "^4.3.0" prebuild-install "^7.0.1" -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +keyv@^4.0.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" + integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== dependencies: - json-buffer "3.0.0" + json-buffer "3.0.1" lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -lodash@^4.17.10, lodash@^4.17.15: +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" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +lodash@^4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -1288,7 +1398,7 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mimic-response@^1.0.0, mimic-response@^1.0.1: +mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== @@ -1313,9 +1423,9 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: brace-expansion "^1.1.7" minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + 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" @@ -1325,12 +1435,17 @@ minimist@^1.2.0, minimist@^1.2.3: integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass@^3.0.0: - version "3.3.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" - integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== 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== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -1370,9 +1485,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^3.3.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718" - integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A== + 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== dependencies: semver "^7.3.5" @@ -1393,18 +1508,10 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== - -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.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" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== npm-run-path@^2.0.0: version "2.0.2" @@ -1425,16 +1532,33 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -1450,16 +1574,16 @@ 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-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - plist@^3.0.1, plist@^3.0.4: version "3.0.6" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" @@ -1486,21 +1610,11 @@ prebuild-install@^7.0.1: tar-fs "^2.0.0" tunnel-agent "^0.6.0" -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== - 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== -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== - proxy-from-env@1.1.0, 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" @@ -1515,35 +1629,42 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -puppeteer-core@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz#8d0198550e04c7d5e0847200ba257b2a777dbd3b" - integrity sha512-OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g== +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== dependencies: cross-fetch "3.1.5" debug "4.3.4" - devtools-protocol "0.0.1045489" + 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.9.0" + ws "8.10.0" -puppeteer@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz#848986e6ecec37b19cd5a7327ad2fcf1f1cb83fd" - integrity sha512-3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw== +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== 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.0.0" + puppeteer-core "19.4.0" + +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== rc@^1.2.7: version "1.2.8" @@ -1580,12 +1701,22 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== dependencies: - lowercase-keys "^1.0.0" + lowercase-keys "^2.0.0" rimraf@3.0.2, rimraf@^3.0.0: version "3.0.2" @@ -1706,9 +1837,9 @@ simple-get@^4.0.0: simple-concat "^1.0.0" simple-update-notifier@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" - integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + 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== dependencies: semver "~7.0.0" @@ -1789,6 +1920,13 @@ sumchecker@^3.0.1: dependencies: debug "^4.1.0" +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -1818,13 +1956,13 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^4.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -1856,11 +1994,6 @@ tmp@^0.2.0: dependencies: rimraf "^3.0.0" -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -1880,11 +2013,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -1915,13 +2043,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== - dependencies: - prepend-http "^2.0.0" - utf8-byte-length@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" @@ -1982,10 +2103,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@8.9.0: - version "8.9.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e" - integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== +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== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2002,15 +2123,15 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^21.0.0: +yargs-parser@^21.1.1: version "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.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" - integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== dependencies: cliui "^8.0.1" escalade "^3.1.1" @@ -2018,7 +2139,7 @@ yargs@^17.5.1: require-directory "^2.1.1" string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^21.0.0" + yargs-parser "^21.1.1" yauzl@^2.10.0: version "2.10.0" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix index b22d280d8a..e77dea2cc2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix @@ -9,6 +9,30 @@ sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; }; } + { + name = "_babel_code_frame___code_frame_7.18.6.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_helper_validator_identifier___helper_validator_identifier_7.19.1.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_highlight___highlight_7.18.6.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 = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { @@ -18,11 +42,11 @@ }; } { - name = "_electron_get___get_1.14.1.tgz"; + name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { - name = "_electron_get___get_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; - sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + name = "_electron_get___get_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; + sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; }; } { @@ -34,11 +58,11 @@ }; } { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz"; - sha512 = "CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ=="; + 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=="; }; } { @@ -58,19 +82,19 @@ }; } { - name = "_sindresorhus_is___is_0.14.0.tgz"; + name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { - name = "_sindresorhus_is___is_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + name = "_sindresorhus_is___is_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; } { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; path = fetchurl { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; } { @@ -81,6 +105,14 @@ sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } + { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + path = fetchurl { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; + sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; + }; + } { name = "_types_debug___debug_4.1.7.tgz"; path = fetchurl { @@ -105,6 +137,22 @@ 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"; + url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; + sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; + }; + } + { + name = "_types_keyv___keyv_3.1.4.tgz"; + path = fetchurl { + name = "_types_keyv___keyv_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; + sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; + }; + } { name = "_types_minimatch___minimatch_5.1.2.tgz"; path = fetchurl { @@ -122,19 +170,19 @@ }; } { - name = "_types_node___node_18.11.3.tgz"; + name = "_types_node___node_18.11.19.tgz"; path = fetchurl { - name = "_types_node___node_18.11.3.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz"; - sha512 = "fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A=="; + 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_16.11.68.tgz"; + name = "_types_node___node_16.18.12.tgz"; path = fetchurl { - name = "_types_node___node_16.11.68.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz"; - sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; + name = "_types_node___node_16.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz"; + sha512 = "vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw=="; }; } { @@ -145,6 +193,14 @@ sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; }; } + { + name = "_types_responselike___responselike_1.0.0.tgz"; + path = fetchurl { + name = "_types_responselike___responselike_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; + }; + } { name = "_types_verror___verror_1.10.6.tgz"; path = fetchurl { @@ -162,11 +218,11 @@ }; } { - name = "_types_yargs___yargs_17.0.13.tgz"; + name = "_types_yargs___yargs_17.0.22.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; - sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; + name = "_types_yargs___yargs_17.0.22.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz"; + sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g=="; }; } { @@ -209,6 +265,14 @@ sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + } { name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { @@ -306,11 +370,11 @@ }; } { - name = "axios___axios_1.1.3.tgz"; + name = "axios___axios_1.3.2.tgz"; path = fetchurl { - name = "axios___axios_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz"; - sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; + name = "axios___axios_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz"; + sha512 = "1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw=="; }; } { @@ -362,11 +426,11 @@ }; } { - name = "bootstrap___bootstrap_5.2.2.tgz"; + name = "bootstrap___bootstrap_5.2.3.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_5.2.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz"; - sha512 = "dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ=="; + name = "bootstrap___bootstrap_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz"; + sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="; }; } { @@ -458,11 +522,35 @@ }; } { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; path = fetchurl { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + }; + } + { + name = "cacheable_request___cacheable_request_7.0.2.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 = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -498,11 +586,11 @@ }; } { - name = "ci_info___ci_info_3.5.0.tgz"; + name = "ci_info___ci_info_3.7.1.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; - sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; + 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=="; }; } { @@ -537,6 +625,14 @@ sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; }; } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + } { name = "color_convert___color_convert_2.0.1.tgz"; path = fetchurl { @@ -545,6 +641,14 @@ sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; + }; + } { name = "color_name___color_name_1.1.4.tgz"; path = fetchurl { @@ -601,14 +705,6 @@ sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } - { - name = "config_chain___config_chain_1.1.13.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -617,6 +713,14 @@ sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; } + { + name = "cosmiconfig___cosmiconfig_8.0.0.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 = "crc___crc_3.8.0.tgz"; path = fetchurl { @@ -665,14 +769,6 @@ sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } - { - name = "decompress_response___decompress_response_3.3.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; - }; - } { name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { @@ -690,11 +786,11 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; path = fetchurl { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; + sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; } { @@ -730,11 +826,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz"; - sha512 = "D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ=="; + 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=="; }; } { @@ -777,14 +873,6 @@ sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } - { - name = "duplexer3___duplexer3_0.1.5.tgz"; - path = fetchurl { - name = "duplexer3___duplexer3_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz"; - sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; - }; - } { name = "ejs___ejs_3.1.8.tgz"; path = fetchurl { @@ -818,11 +906,11 @@ }; } { - name = "electron___electron_21.2.0.tgz"; + name = "electron___electron_22.2.0.tgz"; path = fetchurl { - name = "electron___electron_21.2.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz"; - sha512 = "oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg=="; + name = "electron___electron_22.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz"; + sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g=="; }; } { @@ -833,14 +921,6 @@ sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } - { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - } { name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { @@ -857,6 +937,14 @@ sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + } { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { @@ -873,6 +961,14 @@ sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; + }; + } { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; path = fetchurl { @@ -1034,11 +1130,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + 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=="; }; } { @@ -1081,14 +1177,6 @@ sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } - { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - path = fetchurl { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; - }; - } { name = "globalthis___globalthis_1.0.3.tgz"; path = fetchurl { @@ -1098,11 +1186,11 @@ }; } { - name = "got___got_9.6.0.tgz"; + name = "got___got_11.8.6.tgz"; path = fetchurl { - name = "got___got_9.6.0.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + name = "got___got_11.8.6.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; + sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; }; } { @@ -1121,6 +1209,14 @@ sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; }; } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; + }; + } { name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { @@ -1162,11 +1258,11 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; } { @@ -1177,6 +1273,14 @@ sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } + { + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + path = fetchurl { + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; + sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; + }; + } { name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; path = fetchurl { @@ -1209,6 +1313,14 @@ sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -1233,6 +1345,14 @@ sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; + }; + } { name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { @@ -1313,6 +1433,14 @@ sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; }; } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + } { name = "js_yaml___js_yaml_4.1.0.tgz"; path = fetchurl { @@ -1322,11 +1450,19 @@ }; } { - name = "json_buffer___json_buffer_3.0.0.tgz"; + name = "json_buffer___json_buffer_3.0.1.tgz"; path = fetchurl { - name = "json_buffer___json_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; + name = "json_buffer___json_buffer_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; } { @@ -1346,11 +1482,11 @@ }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -1378,11 +1514,11 @@ }; } { - name = "keyv___keyv_3.1.0.tgz"; + name = "keyv___keyv_4.5.2.tgz"; path = fetchurl { - name = "keyv___keyv_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + name = "keyv___keyv_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; + sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; }; } { @@ -1393,6 +1529,14 @@ sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; }; } + { + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; + }; + } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -1401,14 +1545,6 @@ sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } - { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; - }; - } { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; path = fetchurl { @@ -1490,11 +1626,11 @@ }; } { - name = "minimatch___minimatch_5.1.0.tgz"; + name = "minimatch___minimatch_5.1.6.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + name = "minimatch___minimatch_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; } { @@ -1506,11 +1642,19 @@ }; } { - name = "minipass___minipass_3.3.4.tgz"; + name = "minipass___minipass_3.3.6.tgz"; path = fetchurl { - name = "minipass___minipass_3.3.4.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz"; - sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + name = "minipass___minipass_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + } + { + name = "minipass___minipass_4.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=="; }; } { @@ -1570,11 +1714,11 @@ }; } { - name = "node_abi___node_abi_3.28.0.tgz"; + name = "node_abi___node_abi_3.31.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.28.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz"; - sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; + 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=="; }; } { @@ -1602,19 +1746,11 @@ }; } { - name = "normalize_url___normalize_url_4.5.1.tgz"; + name = "normalize_url___normalize_url_6.1.0.tgz"; path = fetchurl { - name = "normalize_url___normalize_url_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; - }; - } - { - name = "npm_conf___npm_conf_1.1.3.tgz"; - path = fetchurl { - name = "npm_conf___npm_conf_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + name = "normalize_url___normalize_url_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; } { @@ -1642,11 +1778,11 @@ }; } { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; + name = "p_cancelable___p_cancelable_2.1.1.tgz"; path = fetchurl { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + name = "p_cancelable___p_cancelable_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; } { @@ -1657,6 +1793,22 @@ sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -1681,6 +1833,14 @@ sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + } { name = "pend___pend_1.2.0.tgz"; path = fetchurl { @@ -1689,14 +1849,6 @@ sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; }; } - { - name = "pify___pify_3.0.0.tgz"; - path = fetchurl { - name = "pify___pify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; - }; - } { name = "plist___plist_3.0.6.tgz"; path = fetchurl { @@ -1713,14 +1865,6 @@ sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; }; } - { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; - }; - } { name = "progress___progress_2.0.3.tgz"; path = fetchurl { @@ -1729,14 +1873,6 @@ sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } - { - name = "proto_list___proto_list_1.2.4.tgz"; - path = fetchurl { - name = "proto_list___proto_list_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; - }; - } { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { @@ -1754,27 +1890,35 @@ }; } { - name = "punycode___punycode_2.1.1.tgz"; + name = "punycode___punycode_2.3.0.tgz"; path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + name = "punycode___punycode_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; } { - name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; + name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; path = fetchurl { - name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz"; - sha512 = "OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g=="; + 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___puppeteer_19.0.0.tgz"; + name = "puppeteer___puppeteer_19.4.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_19.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz"; - sha512 = "3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw=="; + name = "puppeteer___puppeteer_19.4.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz"; + sha512 = "sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg=="; + }; + } + { + name = "quick_lru___quick_lru_5.1.1.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; } { @@ -1810,11 +1954,27 @@ }; } { - name = "responselike___responselike_1.0.2.tgz"; + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + } + { + name = "responselike___responselike_2.0.1.tgz"; + path = fetchurl { + name = "responselike___responselike_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; } { @@ -1970,11 +2130,11 @@ }; } { - name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; path = fetchurl { - name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; - sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; + name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; + sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; }; } { @@ -2073,6 +2233,14 @@ sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; }; } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + } { name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { @@ -2098,11 +2266,11 @@ }; } { - name = "tar___tar_6.1.11.tgz"; + name = "tar___tar_6.1.13.tgz"; path = fetchurl { - name = "tar___tar_6.1.11.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + name = "tar___tar_6.1.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; } { @@ -2137,14 +2305,6 @@ sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; } - { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - path = fetchurl { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - } { name = "tr46___tr46_0.0.3.tgz"; path = fetchurl { @@ -2169,14 +2329,6 @@ sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; } - { - name = "tunnel___tunnel_0.0.6.tgz"; - path = fetchurl { - name = "tunnel___tunnel_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; - }; - } { name = "type_fest___type_fest_0.13.1.tgz"; path = fetchurl { @@ -2217,14 +2369,6 @@ sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } - { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; - }; - } { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; path = fetchurl { @@ -2298,11 +2442,11 @@ }; } { - name = "ws___ws_8.9.0.tgz"; + name = "ws___ws_8.10.0.tgz"; path = fetchurl { - name = "ws___ws_8.9.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz"; - sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; + name = "ws___ws_8.10.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz"; + sha512 = "+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw=="; }; } { @@ -2338,11 +2482,11 @@ }; } { - name = "yargs___yargs_17.6.0.tgz"; + name = "yargs___yargs_17.6.2.tgz"; path = fetchurl { - name = "yargs___yargs_17.6.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz"; - sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; + name = "yargs___yargs_17.6.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; + sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix index 26869c3ee0..7ef202202c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "steampipe"; - version = "0.16.4"; + version = "0.18.4"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-awZlA02lKYpFdvCsGUC8Blv8FHek5XskkljseDGjDmk="; + sha256 = "sha256-sCnKnBxZuueH8XgXPqCLrJvS4zUbraz3mZr/2Xn+7YU="; }; - vendorSha256 = "sha256-6l3bBxGhdZGIXmdzgF44TGZQqT6gSUHSwOAE2SlgLgg="; + vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M="; proxyVendor = true; patchPhase = '' runHook prePatch # Patch test that relies on looking up homedir in user struct to prefer ~ substituteInPlace pkg/steampipeconfig/shared_test.go \ - --replace '"github.com/turbot/go-kit/helpers"' "" \ - --replace 'filepaths.SteampipeDir, _ = helpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"'; + --replace 'filehelpers "github.com/turbot/go-kit/files"' "" \ + --replace 'filepaths.SteampipeDir, _ = filehelpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"'; runHook postPatch ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix index 6b41e80ae9..36c69bc498 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.60.0"; + version = "1.61.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-5/YAJl01ARralsBEV6ZJqcYfMMudCmcQcdQD1jn1I+M="; + hash = "sha256-yXD/LILWaXtjd3etdWINglZtvIYE6i6qmCSR3FUUQeM="; }; vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/timer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/timer/default.nix new file mode 100644 index 0000000000..abfd48b83a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/timer/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, timer }: + +buildGoModule rec { + pname = "timer"; + version = "unstable-2023-02-01"; + + src = fetchFromGitHub { + owner = "caarlos0"; + repo = "timer"; + rev = "1f437baceb1ca76b341fdc229fe45938b282f2aa"; + hash = "sha256-u+naemEiKufKYROuJB55u8QgiIgg4nLsB+FerUImtXs="; + }; + + vendorHash = "sha256-n4AjaojcDAYbgOIuaAJ4faVJqV+/0uby5OHRMsyL9Dg="; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = timer; + }; + + meta = with lib; { + description = "A `sleep` with progress"; + homepage = "https://github.com/caarlos0/timer"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 1b21a4d602..4750897b78 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -6,11 +6,11 @@ let in pypkgs.buildPythonApplication rec { pname = "tmuxp"; - version = "1.23.0"; + version = "1.27.0"; src = pypkgs.fetchPypi { inherit pname version; - sha256 = "Ix/43QFOa0kCP5xndszFGk0p12w/t/z+fVcYRIj9y0s="; + sha256 = "sha256-QAk+rcNYjhAgkJX2fa0bl3dHrB4yyYQ/oNlUX3IQMR8="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index aaaa297a55..f3094302cd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.3.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-BKrErM1d90o+yJ/R0vVgXDBwPgQSP3Qj26x4JmB7SXw="; + hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps="; }; - cargoHash = "sha256-jm97lfWHTtd3tE+Yql9CIss78B+bW9nUQAhs5anDb6c="; + cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix index 93b451bedc..5b6e6efff3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8q"; + version = "0.9.8r"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-oY0zmyAgxMHPcBxFNdByQfeLIquw6eQ2SSfCgTKtO7Q="; + sha256 = "sha256-1nCO8wtARnRCanIEH1XAJBjEnW18Bhm+pcr/EeiRrzY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wyrd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wyrd/default.nix index d1244cc73c..df8b4933aa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wyrd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wyrd/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC" ''; - buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ]; + strictDeps = true; + nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp4 ]; + buildInputs = [ ncurses remind ]; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix index 60fc7c2ac7..a8a7dfd3ee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,14 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC, gengetopt, cmake +{ lib +, stdenv +, fetchurl +, pkg-config +, openssl +, check +, pcsclite +, PCSC +, gengetopt +, cmake , withApplePCSC ? stdenv.isDarwin +, gitUpdater +, testers +, yubico-piv-tool }: stdenv.mkDerivation rec { pname = "yubico-piv-tool"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; - hash = "sha256-oCoS2VRdHvehuZhgbYm3tlWl9aFDdzbPUdsIP4dvVak="; + hash = "sha256-2ona/YthhapjU0Z1P53bKa8pvEq9kt2B832dZWC11k4="; }; postPatch = '' @@ -29,8 +41,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; + passthru = { + updateScript = gitUpdater { + url = "https://github.com/Yubico/yubico-piv-tool.git"; + rev-prefix = "yubico-piv-tool-"; + }; + tests.version = testers.testVersion { + inherit version; + package = yubico-piv-tool; + command = "yubico-piv-tool --version"; + }; + }; + meta = with lib; { homepage = "https://developers.yubico.com/yubico-piv-tool/"; + changelog = "https://developers.yubico.com/yubico-piv-tool/Release_Notes.html"; description = '' Used for interacting with the Privilege and Identification Card (PIV) application on a YubiKey diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 730dfabe00..5487d9835c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,14 +3,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; src = fetchFromGitHub { repo = "yubikey-manager"; rev = "refs/tags/${version}"; owner = "Yubico"; - sha256 = "sha256-ZQQhRiUsQwLaOY8NCzSc/PTmRewTL0ECBKj7Uj+6Gn8="; + sha256 = "sha256-Dj3ftyFeVgM0YMFI8cbiH5dmc8SKi2SBbScnc0+ad0M="; }; postPatch = '' @@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = - with python3Packages; ([ + with python3Packages; [ click cryptography pyscard @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { six fido2 keyring - ]) ++ [ + ] ++ [ libu2f-host libusb1 yubikey-personalization diff --git a/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix index 4f4576dfe2..439af060fa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tQTa/iIo7kpcQq1p2romoOG2qNOiSDH7DHx3iZYLY8w="; + hash = "sha256-N439ubEayoyfGrzkXE7+TeJQkddy8PZn5Lhmc/X5VxU="; }; - cargoHash = "sha256-naWkSXQHfImd6R+RHKkmTe8UiqxknZEFYoJ0g/URCVY="; + cargoHash = "sha256-cIHz672jd8NKLyLvwsZInLerdA9MXRgWdpJFgMSgs9Q="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix index 5714a75e50..6e8c7669f0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib +, stdenv +, fetchurl +, nixosTests +}: stdenv.mkDerivation rec { pname = "babeld"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-mrWdesdB82MN8j+cO2fGApTYs0q2IjmPm4l3OoeOyx4="; + hash = "sha256-HbIrYZMHDqJFChq1EZb9cvWKEyn3gMsDiOLksud2jLs="; }; - preBuild = '' - makeFlags="PREFIX=$out ETCDIR=$out/etc" - ''; + outputs = [ + "out" + "man" + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "ETCDIR=${placeholder "out"}/etc" + ]; passthru.tests.babeld = nixosTests.babeld; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix index b2cb534de4..b0f03c0932 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.2"; + version = "2.1.3"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-vFUbsgLgwQGb/2rValFRuZXguxyAJzOBMLnbVs0swes="; + sha256 = "sha256-5wfxjx8SxynY6DpPIvOLwSsBdM/0zSzfaVDQTI/RUD0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix index 919469065c..f36fa1d2d9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dnsmonster"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "mosajjal"; repo = pname; rev = "v${version}"; - hash = "sha256-fpyx2/2P2tMx/n5pCZkUie3uU9jarRU2QVMBs8jEc6Q="; + hash = "sha256-2k/WyAM8h2P2gCLt2J9m/ZekrzCyf/LULGOQYy5bsZs="; }; - vendorSha256 = "sha256-kZkzTi3i8J6K8x+nSjGeyzEBRPeDEP6qX5KMv/weAXg="; + vendorHash = "sha256-gAjR1MoudBAx1dxGObIVPqJdfehWkKckKtwM7sTP0w4="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index d711bc2726..6bf26bfb4d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -10,19 +10,26 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; - rev = version; - sha256 = "sha256-NlaQhQtGQzOaTD18NMiicQOrovRuTCUq54vxu34JqIU="; + rev = "refs/tags/${version}"; + hash = "sha256-9mtXtBq08lL6qQg1Pq1WNwbkG0yi99mCpxNuBvr14ms="; }; - cargoSha256 = "sha256-I9OyH02JNdNgGK3918XwS5wt+11VppCTqzo50LuhnvI="; + cargoHash = "sha256-pKNqO43aFXZ/cbjNWt3tmBBbSTSKqVF7biNCPI1flvI="; - nativeBuildInputs = [ installShellFiles perl ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ + installShellFiles + perl + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; postInstall = '' installManPage ${pname}.1 @@ -31,6 +38,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "The fastest and cross-platform subdomain enumerator"; homepage = "https://github.com/Edu4rdSHL/findomain"; + changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Br1ght0ne ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haguichi/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haguichi/default.nix index 34ba1da28e..deb5119130 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haguichi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haguichi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ztefn"; repo = "haguichi"; rev = version; - sha256 = "1kgjl9g9lyg00cfx4x28s4xyqsqk5057xv6k2cj6ckg9lkxaixvc"; + hash = "sha256-bPeo+qTpTWYkE9PsfgooE2vsO9FIdNIdA+B5ml6i8s0="; }; nativeBuildInputs = [ @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Graphical frontend for Hamachi on Linux"; homepage = "https://haguichi.net/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haguichi/update.sh b/third_party/nixpkgs/pkgs/tools/networking/haguichi/update.sh new file mode 100755 index 0000000000..49a76a79d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/haguichi/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -euo pipefail + +version="$( + curl -s https://api.github.com/repos/ztefn/haguichi/releases | + jq '.[] | select(.target_commitish!="elementary") | .tag_name' --raw-output | + sort --version-sort --reverse | + head -n1 +)" + +update-source-version haguichi "$version" diff --git a/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix index 4a56b8b651..5b598bba1d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-CQDyIGUIijNphOVo+aYZ7SqkxE4md9+H3D/g7jdqV+M="; + sha256 = "sha256-sY2bSCcC+mMuYqLmh+oH76nqg/ybh/nyz3trNH2xPQM="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-wNiEULv+0WlZruxibcKqsw4Ym3retwjoGKXxzACcEeA="; + cargoSha256 = "sha256-Zv7TTQw4UcuQBhEdjD5nwcE1LonUHLUFf9BVhRWWuDo="; postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 diff --git a/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix index bd8e6e6d31..94365191cd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "HyNetwork"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9ib/29yCfI4oS2yZQUePzZ+5FVTevvJCPjpTXmKnKeA="; + sha256 = "sha256-CQgCFtvQDvhHTk10gpxfAvEJLz/i+CXXyzGrxi26hBk="; }; - vendorSha256 = "sha256-sRPnPKVuvcUHEldKVpgmGFGpwOSK5qh4EfeUQMFdMw8="; + vendorSha256 = "sha256-sN+2XYoC+dDs6QKxwxuBCW4dOf4elSNKdOrbMxjOtSY="; proxyVendor = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index 0d6c2f617d..a05372a157 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; - rev = "${pname}-${version}"; - hash = "sha256-oim234254qUWITfgBfB2theMgpVnGHNmrzwE5ULM2M4="; + rev = "refs/tags/${pname}-${version}"; + hash = "sha256-/CW+CmtKc96tVEh5cB6x+/Hb4WnbVi+3AZ0CEao0NE4="; }; vendorSha256 = null; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; + changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix index 1618dac132..c2a9cf4252 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.3.3"; + version = "0.4.3"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - sha256 = "sha256-KXyvoHtPC71QkB+X6cRCBxAUcTuy+j8/ZAJe7n6EdGc="; + hash = "sha256-O/qiznQs+x7qBYXVItd0W7a0irEzRf0We7kW7HHLqcw="; }; postConfigure = '' @@ -17,14 +17,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-extldflags '-static'" ]; - vendorSha256 = "sha256-dzHdPgOjYXSozDxehkVNQocsYdH0u0p80c1THUzedk8="; + vendorHash = "sha256-If0K6DmkGk3AmO3eb/ocAl1RJeBN/xgY7dOh9lnVLh8="; doCheck = false; # tests require network access meta = with lib; { homepage = "https://github.com/tnpitsecurity/ligolo-ng"; description = "A tunneling/pivoting tool that uses a TUN interface"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 4f312d0e6a..47f106e5f2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-01-11T03-14-16Z"; + version = "2023-01-28T20-29-38Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-wxI4m4RAvi2YCx+RWO9HQyn927O3PUJ/A9i/5IOtbZ8="; + sha256 = "sha256-xlhAPJvZcd4tkaIK+xflUXcFKMbQQX8QgCSD7CTiPu8="; }; - vendorHash = "sha256-Exhw9H+qayQnpT4qCaeOsmbTCmCy80UKk8ZxDuOOHcA="; + vendorHash = "sha256-fSHgwllxk10ipacOmtXXqFupEp3kuG25KIRklwmtIMU="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix index dcedbb1409..3763f2ce19 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix @@ -1,9 +1,9 @@ { buildGoModule , cmake , fetchFromGitHub -, fetchpatch , go , lib +, libsecret , pkg-config , polkit , python3 @@ -15,28 +15,20 @@ , qtwebsockets , rustPlatform , stdenv -, which , wireguard-tools , wrapQtAppsHook }: let pname = "mozillavpn"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-T8dPM90X4soVG/plKsf7DM9XgdX5Vcp0i6zTE60gbq0="; + hash = "sha256-EwHuNJZpTb7oFOKKDv0zWgklUe95Th97KP9G5DqRokA="; }; - patches = [ - # vpnglean: Add Cargo.lock file - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/5236/commits/6fdc689001619a06b752fa629647642ea66f4e26.patch"; - hash = "sha256-j666Z31D29WIL3EXbek2aLzA4Fui/9VZvupubMDG24Q="; - }) - ]; netfilter-go-modules = (buildGoModule { inherit pname version src; @@ -48,26 +40,27 @@ let inherit src; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-/DmKSV0IKxZV0Drh6dTsiqgZhuxt6CoegXpYdqN4UzQ="; + hash = "sha256-q6Wf+jrGjGMiDEmnErnDau6Li64Dyq8t2SN1I4rspBY="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-6qyMARhPPgTryEtaBNrIPN9ja/fe7Fyx38iGuTd+Dk8="; + hash = "sha256-Dbu4WX2u3uDDUuZzS/hczypSFkQNnvuj2Su2X0QvSN4="; }; vpngleanDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}-vpnglean"; preBuild = "cd vpnglean"; - hash = "sha256-8OLTQmRvy6pATEBX2za6f9vMEqwkf9L5VyERtAN2BDQ="; + hash = "sha256-FDkziDDup+D7Bh+Wclqxn8Dhm/T2DanhjKXIAEFDhzc="; }; in stdenv.mkDerivation { - inherit pname version src patches; + inherit pname version src; buildInputs = [ + libsecret polkit qt5compat qtbase @@ -81,13 +74,11 @@ stdenv.mkDerivation { pkg-config python3 python3.pkgs.glean-parser - python3.pkgs.lxml python3.pkgs.pyyaml python3.pkgs.setuptools rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - which wrapQtAppsHook ]; @@ -110,15 +101,13 @@ stdenv.mkDerivation { dontCargoSetupPostUnpack = true; postPatch = '' - for file in linux/*.service linux/extra/*.desktop src/platforms/linux/daemon/*.service; do - substituteInPlace "$file" --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" - done + substituteInPlace src/apps/vpn/platforms/linux/daemon/org.mozilla.vpn.dbus.service --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" substituteInPlace scripts/addon/build.py \ --replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \ --replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"' - substituteInPlace src/cmake/linux.cmake \ + substituteInPlace src/apps/vpn/cmake/linux.cmake \ --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ --replace '${"$"}{POLKIT_POLICY_DIR}' "$out/share/polkit-1/actions" \ --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix b/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix index 77c7d4161d..08028910f8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Peer-to-peer VPN"; homepage = "https://www.ntop.org/products/n2n/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix index 521c8ff2f2..6f4483cd72 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nebula"; @@ -17,6 +17,10 @@ buildGoModule rec { ldflags = [ "-X main.Build=${version}" ]; + passthru.tests = { + inherit (nixosTests) nebula; + }; + meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix index bac09558e7..46037d2c4f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix @@ -3,23 +3,24 @@ , fetchFromGitHub , installShellFiles , mandown +, protobuf , nixosTests }: rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nG+HTwF3v8FUK2SE+I312Ec5y6YPShS9si9Pc2SG1jc="; + hash = "sha256-EuhnI7N8Ry6qV4q3QxdHdTuJ7F4gIA3a9NZnb33KWZ8="; }; - cargoHash = "sha256-szIG1udBCZj18sN3IiQtOuR8qw/xWhTMgb/n4lyTwvs="; + cargoHash = "sha256-2FEtYnIRg4s92K8Kr123tuZqUsGOauel2JdeSF0bFGo="; - nativeBuildInputs = [ installShellFiles mandown ]; + nativeBuildInputs = [ installShellFiles mandown protobuf ]; postBuild = '' make -C docs netavark.1 diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix index af4c18e1ce..8f3ed67abc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -23,25 +23,24 @@ , glib , substituteAll , lib +, _experimental-update-script-combinators +, makeHardcodeGsettingsPatch }: stdenv.mkDerivation rec { pname = "libnma"; - version = "1.10.4"; + version = "1.10.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "eecw3aGfmzSIb0BkqhcPGiMmsIMp1lXYC2fpBsf3i3w="; + sha256 = "U6b7KxkK03xZhsrtPpi+3nw8YCOZ7k+TyPwFQwPXbas="; }; patches = [ # Needed for wingpanel-indicator-network and switchboard-plug-network ./hardcode-gsettings.patch - # Removing path from eap schema to fix bug when creating new VPN connection - # https://gitlab.gnome.org/GNOME/libnma/-/issues/18 - ./remove-path-from-eap.patch ]; nativeBuildInputs = [ @@ -86,10 +85,24 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; + hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { + schemaIdToVariableMapping = { + "org.gnome.nm-applet.eap" = "NM_APPLET_GSETTINGS"; + }; + inherit src; }; + updateScript = + let + updateSource = gnome.updateScript { + packageName = "libnma"; + versionPolicy = "odd-unstable"; + }; + updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "libnma.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateGsettingsPatch + ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch index 9b2f536695..a68f96113d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch @@ -1,26 +1,24 @@ +diff --git a/src/nma-ws/nma-eap.c b/src/nma-ws/nma-eap.c +index fa36907..81df821 100644 --- a/src/nma-ws/nma-eap.c +++ b/src/nma-ws/nma-eap.c -@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection) - static GSettings * - _get_ca_ignore_settings (NMConnection *connection) - { -+ g_autoptr (GSettingsSchemaSource) *schema_source; -+ g_autoptr (GSettingsSchema) *schema; - GSettings *settings; - char *path = NULL; - const char *uuid; - - g_return_val_if_fail (connection, NULL); - -+ schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL); -+ schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE); -+ - uuid = nm_connection_get_uuid (connection); +@@ -252,7 +252,18 @@ _get_ca_ignore_settings (NMConnection *connection) g_return_val_if_fail (uuid && *uuid, NULL); - + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); - settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); -+ settings = g_settings_new_full (schema, NULL, path); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@NM_APPLET_GSETTINGS@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.nm-applet.eap", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, path); ++ } g_free (path); - + return settings; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch deleted file mode 100644 index fe00ff9d9a..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 9 Nov 2022 08:00:19 +0000 -Subject: [PATCH] gschema: Remove path from eap schema - -This one needs to be relocatable, otherwise creating a new VPN -connection will fail with: - - settings object created with schema 'org.gnome.nm-applet.eap' - and path '/org/gnome/nm-applet/eap//', - but path '/org/gnome/nm-applet/eap/' is specified by schema - -Fixes: https://bugs.archlinux.org/task/76490 ---- - org.gnome.nm-applet.eap.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in -index 0fc3ca9f..f4a56ea6 100644 ---- a/org.gnome.nm-applet.eap.gschema.xml.in -+++ b/org.gnome.nm-applet.eap.gschema.xml.in -@@ -1,6 +1,6 @@ - - -- -+ - - false - Ignore CA certificate --- -GitLab - diff --git a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix index e81eb7b0a4..62e30f9399 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix @@ -1,27 +1,34 @@ -{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, pkg-config +, openssl +, darwin +}: rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-NSre4OHzREVM8y9njMkS/whQ0+Ed+R+cLYfRWKmhA98="; + sha256 = "sha256-0Z8+dpZs0KMknyuw4Brkr8UosTDk75Kvy6zA/d91xgE="; }; - cargoSha256 = "sha256-GPP2eespnxDQoKZkqoPXEthRKk84szFl0LNTeqJQLNs="; + cargoSha256 = "sha256-isrfxnZbkIqQJ+jipYXvl1QgQ6hwRMdGA1kKFM1saDQ="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; - buildInputs = lib.optional stdenv.isLinux openssl - ++ lib.optional stdenv.isDarwin Security; - - # remove cargo config so it can find the linker - postPatch = '' - rm .cargo/config.toml - ''; + buildInputs = lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # tests don't work inside the sandbox doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 339b2aecba..69ab1b35c1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.2.1"; + version = "6.3.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-8shgDywj7hEj7r9H7w9A2zhmJ+dbA0DKFhgsEPQXT6k="; + sha256 = "sha256-1xTXvuxQCksCT+pj4+eHyb8fAc4YcK9Tn3xIijB7P1s="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix index 0764c27408..a5ecaa79e9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3420.31"; + version = "1.3.3430.77"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-FKLYpn2HeAVGN9OjLowv2BJRLZKReqXLPFvbin/jaBo="; + sha256 = "sha256-tB6BAtLIlsU7mQmJ/Ec94X2r0mmGJlefc2NkyDhQ2Ek="; }; modRoot = "cli"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index d4e2b590b0..f478173123 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -18,8 +18,17 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; - cargoBuildFlags = [ - "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun" + cargoBuildFeatures = [ + "trust-dns" + "local-http-native-tls" + "local-tunnel" + "local-socks4" + "local-redir" + "local-dns" + "local-tun" + "aead-cipher-extra" + "aead-cipher-2022" + "aead-cipher-2022-extra" ]; # all of these rely on connecting to www.example.com:80 diff --git a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix index f58fd9a998..2ac9931f2c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2022.10"; + version = "2022.12"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "GIIW+2/1fuHTmYev/QvuO5Yb2ozbyw/45qQkym36US8="; + sha256 = "sha256-DPJ1GrqZQyiW2s5JBZszcB/Is0Is2f/O/6Riz/M3wAs="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix index 766c9a0950..f7118b6950 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ssldump"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; rev = "v${version}"; - sha256 = "sha256-nk1sXQN9cPIZD7Xlg8CHmKySfvfWl2j0CGxmIyvA6z4="; + sha256 = "sha256-mK8n+Dn7fUzmclUzlIqGjO2zzIVKQEhSRvYeuFwVJx8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix index 244dd3bbcd..4be019c5fa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchurl, openssl, nixosTests }: +{ lib, stdenv, fetchurl, openssl +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, nixosTests +}: + stdenv.mkDerivation rec { pname = "stunnel"; version = "5.67"; + outputs = [ "out" "doc" "man" ]; + src = fetchurl { url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz"; sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456"; @@ -11,11 +17,19 @@ stdenv.mkDerivation rec { # not the output of `nix-prefetch-url` }; - buildInputs = [ openssl ]; + enableParallelBuilding = true; + + buildInputs = [ + openssl + ] ++ lib.optionals systemdSupport [ + systemd + ]; + configureFlags = [ "--with-ssl=${openssl.dev}" "--sysconfdir=/etc" "--localstatedir=/var" + (lib.enableFeature systemdSupport "systemd") ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix index 8b0c987059..ba8b46d486 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "subnetcalc"; - version = "2.4.20"; + version = "2.4.21"; src = fetchFromGitHub { owner = "dreibh"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-ZKEcDLwZPPgbaSx+LvTHNWcdYR/mZEGLc9b0Fb+CyEE="; + sha256 = "sha256-cFlNx59PaI5GvbEKUplNEq5HVCNt40ZJUvMj2UIbe2A="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index 924d2c3afa..ff34a39fc0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.18"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; - rev = version; - sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs="; + rev = "06428f13c638180dd349a4c42a17b569ab51a25f"; + sha256 = "sha256-84jGcR/E1QoqIlbGu67muYUtZU66ZJtj4tdZvmYbII4="; }; - cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk="; + cargoSha256 = "sha256-bVHvQRtnKwrwS0huax6OrteYfxws2Ce2fFaBQ3oeoow="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix b/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix index fdb95b121f..1bb0639252 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "udp2raw"; - version = "20200818.0"; + version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = "udp2raw"; rev = version; - hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8="; + hash = "sha256-mchSaqw6sOJ7+dydCM8juP7QMOVUrPL4MFA79Rvyjdo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix index 93683bc6f7..1320387a21 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix @@ -16,7 +16,7 @@ , systemd , voms , zlib -, enableTests ? true +, enableTests ? stdenv.isLinux # If not null, the builder will # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. , externalEtc ? "/etc" @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { openssl readline zlib + fuse ] ++ lib.optionals stdenv.isLinux [ - fuse systemd voms ] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix index 473830097a..c60f88022c 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-97aAlH03H8xTVhp45FwecNb7i/ZUtJG9OOYBx8Sf+YI="; + hash = "sha256-x9UrBCnEGz6nI1XGBLjIeiF3qi3EvynAfafiuhQdt9Q="; }; - cargoHash = "sha256-uvn1cP6aIxfPKG/QLtHBd6fHjl7JNRtkZ4gIG2tpHVg="; + cargoHash = "sha256-RUfprANAbj8w8LPRwQEF9SD9fhWb1CEcwbvOa6DX9Xk="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix index 28e798645d..0a1ad4fce1 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix @@ -3,12 +3,66 @@ { lib, writeText }: let - inherit (builtins) concatLists concatStringsSep length; - inherit (lib) flip licenses mapAttrsToList optional; + inherit (lib) + concatMapAttrs + filterAttrs + flip + id + intersectLists + licenses + mapAttrsToList + optionalAttrs + pipe + warn + attrNames + concatStringsSep + length + ; - inserts = concatLists - (flip mapAttrsToList licenses - (k: v: optional (v ? spdxId) '' xs.insert("${v.spdxId}", "${k}");'')); + licenseMap = flip concatMapAttrs licenses + (k: v: optionalAttrs (v ? spdxId && !v.deprecated) { ${v.spdxId} = k; }); + + deprecatedAliases = { + "AGPL-3.0" = "agpl3Only"; + "BSD-2-Clause-FreeBSD" = "bsd2WithViews"; + "BSD-2-Clause-NetBSD" = "bsd2"; + "GFDL-1.1" = "fdl11Only"; + "GFDL-1.2" = "fdl12Only"; + "GFDL-1.3" = "fdl13Only"; + "GPL-1.0" = "gpl1Only"; + "GPL-1.0+" = "gpl1Plus"; + "GPL-2.0" = "gpl2Only"; + "GPL-2.0+" = "gpl2Plus"; + "GPL-3.0" = "gpl3Only"; + "GPL-3.0+" = "gpl3Plus"; + "LGPL-2.0" = "lgpl2Only"; + "LGPL-2.0+" = "lgpl2Plus"; + "LGPL-2.1" = "lgpl21Only"; + "LGPL-2.1+" = "lgpl21Plus"; + "LGPL-3.0" = "lgpl3Only"; + "LGPL-3.0+" = "lgpl3Plus"; + }; + + lints = { + "deprecated licenses" = intersectLists + (attrNames licenseMap) + (attrNames deprecatedAliases); + + "invalid aliases" = attrNames (filterAttrs + (k: v: licenses.${v}.deprecated or true) + deprecatedAliases); + }; + + lint = flip pipe + (flip mapAttrsToList lints (k: v: + if v == [ ] then + id + else + warn "${k}: ${concatStringsSep ", " v}")); + + inserts = lint (mapAttrsToList + (k: v: '' xs.insert("${k}", "${v}");'') + (deprecatedAliases // licenseMap)); in writeText "license.rs" '' diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix index 55bbbd9ffa..312bc80582 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix @@ -2,6 +2,7 @@ , stdenv , python3 , python3Minimal +, runCommand }: let @@ -21,9 +22,23 @@ let markdown-it-py = markdown-it-py-no-tests; disableTests = true; }; + + makeDeps = pkgs: small: + [ pkgs.frozendict ] + ++ ( + if small + then [ + markdown-it-py-no-tests + mdit-py-plugins-no-tests + ] + else [ + pkgs.markdown-it-py + pkgs.mdit-py-plugins + ] + ); in -python.pkgs.buildPythonApplication { +python.pkgs.buildPythonApplication rec { pname = "nixos-render-docs"; version = "0.0"; format = "pyproject"; @@ -47,14 +62,21 @@ python.pkgs.buildPythonApplication { python.pkgs.pytestCheckHook ]; - propagatedBuildInputs = [ - markdown-it-py-no-tests - mdit-py-plugins-no-tests - python.pkgs.frozendict - ]; + propagatedBuildInputs = makeDeps python.pkgs true; pytestFlagsArray = [ "-vvrP" "tests/" ]; + # NOTE this is a CI test rather than a build-time test because we want to keep the + # build closures small. mypy has an unreasonably large build closure for docs builds. + passthru.tests.typing = runCommand "${pname}-mypy" { + nativeBuildInputs = [ + (python3.withPackages (p: [ p.mypy p.pytest ] ++ makeDeps p false)) + ]; + } '' + mypy --strict ${src} + touch $out + ''; + meta = with lib; { description = "Renderer for NixOS manual and option docs"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py index 5af13267b1..67d7bce004 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py @@ -1,12 +1,38 @@ import argparse import os import sys +import textwrap +import traceback +from io import StringIO +from pprint import pprint from typing import Any, Dict from .md import Converter from . import manual from . import options +def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None: + print(f"\x1b[1;31m{_desc_text}:\x1b[0m", file=sys.stderr) + # destructure Exception and RuntimeError specifically so we can show nice + # messages for errors that weren't given their own exception type with + # a good pretty-printer. + if type(e) is Exception or type(e) is RuntimeError: + args = e.args + if len(args) and isinstance(args[0], str): + print("\t", args[0], file=sys.stderr, sep="") + args = args[1:] + buf = StringIO() + for arg in args: + pprint(arg, stream=buf) + if extra_info := buf.getvalue(): + print(f"\x1b[1;34mextra info:\x1b[0m", file=sys.stderr) + print(textwrap.indent(extra_info, "\t"), file=sys.stderr, end="") + else: + print(e) + if e.__context__ is not None: + print("", file=sys.stderr) + pretty_print_exc(e.__context__, _desc_text="caused by") + def main() -> None: parser = argparse.ArgumentParser(description='render nixos manual bits') @@ -16,9 +42,14 @@ def main() -> None: manual.build_cli(commands.add_parser('manual')) args = parser.parse_args() - if args.command == 'options': - options.run_cli(args) - elif args.command == 'manual': - manual.run_cli(args) - else: - raise RuntimeError('command not hooked up', args) + try: + if args.command == 'options': + options.run_cli(args) + elif args.command == 'manual': + manual.run_cli(args) + else: + raise RuntimeError('command not hooked up', args) + except Exception as e: + traceback.print_exc() + pretty_print_exc(e) + sys.exit(1) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py index bad36e57a2..28c4425d8c 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py @@ -103,7 +103,7 @@ class DocBookRenderer(Renderer): # HACK open and close para for docbook change size. remove soon. def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: - spacing = ' spacing="compact"' if token.attrs.get('compact', False) else '' + spacing = ' spacing="compact"' if token.meta.get('compact', False) else '' return f"\n" def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: @@ -218,7 +218,7 @@ class DocBookRenderer(Renderer): def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: start = f' startingnumber="{token.attrs["start"]}"' if 'start' in token.attrs else "" - spacing = ' spacing="compact"' if token.attrs.get('compact', False) else '' + spacing = ' spacing="compact"' if token.meta.get('compact', False) else '' return f"" def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py new file mode 100644 index 0000000000..24d0e8f3d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py @@ -0,0 +1,330 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from dataclasses import dataclass +from typing import Any, cast, Iterable, Optional + +import re + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +from .md import Renderer + +# roff(7) says: +# +# > roff documents may contain only graphable 7-bit ASCII characters, the space character, +# > and, in certain circumstances, the tab character. The backslash character ‘\’ indicates +# > the start of an escape sequence […] +# +# mandoc_char(7) says about the `'~^ characters: +# +# > In prose, this automatic substitution is often desirable; but when these characters have +# > to be displayed as plain ASCII characters, for example in source code samples, they require +# > escaping to render as follows: +# +# since we don't want these to be touched anywhere (because markdown will do all substituations +# we want to have) we'll escape those as well. we also escape " (macro metacharacter), - (might +# turn into a typographic hyphen), and . (roff request marker at SOL, changes spacing semantics +# at EOL). groff additionally does not allow unicode escapes for codepoints below U+0080, so +# those need "proper" roff escapes/replacements instead. +_roff_unicode = re.compile(r'''[^\n !#$%&()*+,\-./0-9:;<=>?@A-Z[\\\]_a-z{|}]''', re.ASCII) +_roff_escapes = { + ord('"'): "\\(dq", + ord("'"): "\\(aq", + ord('-'): "\\-", + ord('.'): "\\&.", + ord('\\'): "\\e", + ord('^'): "\\(ha", + ord('`'): "\\(ga", + ord('~'): "\\(ti", +} +def man_escape(s: str) -> str: + s = s.translate(_roff_escapes) + return _roff_unicode.sub(lambda m: f"\\[u{ord(m[0]):04X}]", s) + +# remove leading and trailing spaces from links and condense multiple consecutive spaces +# into a single space for presentation parity with html. this is currently easiest with +# regex postprocessing and some marker characters. since we don't want to drop spaces +# from code blocks we will have to specially protect *inline* code (luckily not block code) +# so normalization can turn the spaces inside it into regular spaces again. +_normalize_space_re = re.compile(r'''\u0000 < *| *>\u0000 |(?<= ) +''') +def _normalize_space(s: str) -> str: + return _normalize_space_re.sub("", s).replace("\0p", " ") + +def _protect_spaces(s: str) -> str: + return s.replace(" ", "\0p") + +@dataclass(kw_only=True) +class List: + width: int + next_idx: Optional[int] = None + compact: bool + first_item_seen: bool = False + +# this renderer assumed that it produces a set of lines as output, and that those lines will +# be pasted as-is into a larger output. no prefixing or suffixing is allowed for correctness. +# +# NOTE that we output exclusively physical markup. this is because we have to use the older +# mandoc(7) format instead of the newer mdoc(7) format due to limitations in groff: while +# using mdoc in groff works fine it is not a native format and thus very slow to render on +# manpages as large as configuration.nix.5. mandoc(1) renders both really quickly, but with +# groff being our predominant manpage viewer we have to optimize for groff instead. +# +# while we do use only physical markup (adjusting indentation with .RS and .RE, adding +# vertical spacing with .sp, \f[BIRP] escapes for bold/italic/roman/$previous font, \h for +# horizontal motion in a line) we do attempt to copy the style of mdoc(7) semantic requests +# as appropriate for each markup element. +class ManpageRenderer(Renderer): + __output__ = "man" + + # whether to emit mdoc .Ql equivalents for inline code or just the contents. this is + # mainly used by the options manpage converter to not emit extra quotes in defaults + # and examples where it's already clear from context that the following text is code. + inline_code_is_quoted: bool = True + link_footnotes: Optional[list[str]] = None + + _href_targets: dict[str, str] + + _link_stack: list[str] + _do_parbreak_stack: list[bool] + _list_stack: list[List] + _font_stack: list[str] + + def __init__(self, manpage_urls: Mapping[str, str], href_targets: dict[str, str], + parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._href_targets = href_targets + self._link_stack = [] + self._do_parbreak_stack = [] + self._list_stack = [] + self._font_stack = [] + + def _join_block(self, ls: Iterable[str]) -> str: + return "\n".join([ l for l in ls if len(l) ]) + def _join_inline(self, ls: Iterable[str]) -> str: + return _normalize_space(super()._join_inline(ls)) + + def _enter_block(self) -> None: + self._do_parbreak_stack.append(False) + def _leave_block(self) -> None: + self._do_parbreak_stack.pop() + self._do_parbreak_stack[-1] = True + def _maybe_parbreak(self, suffix: str = "") -> str: + result = f".sp{suffix}" if self._do_parbreak_stack[-1] else "" + self._do_parbreak_stack[-1] = True + return result + + def _admonition_open(self, kind: str) -> str: + self._enter_block() + return ( + '.sp\n' + '.RS 4\n' + f'\\fB{kind}\\fP\n' + '.br' + ) + def _admonition_close(self) -> str: + self._leave_block() + return ".RE" + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._do_parbreak_stack = [ False ] + self._font_stack = [ "\\fR" ] + return super().render(tokens, options, env) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return man_escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._maybe_parbreak() + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".br" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return " " + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + s = _protect_spaces(man_escape(token.content)) + return f"\\fR\\(oq{s}\\(cq\\fP" if self.inline_code_is_quoted else s + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self.fence(token, tokens, i, options, env) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + href = cast(str, token.attrs['href']) + self._link_stack.append(href) + text = "" + if tokens[i + 1].type == 'link_close' and href in self._href_targets: + # TODO error or warning if the target can't be resolved + text = self._href_targets[href] + self._font_stack.append("\\fB") + return f"\\fB{text}\0 <" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + href = self._link_stack.pop() + text = "" + if self.link_footnotes is not None: + try: + idx = self.link_footnotes.index(href) + 1 + except ValueError: + self.link_footnotes.append(href) + idx = len(self.link_footnotes) + text = "\\fR" + man_escape(f"[{idx}]") + self._font_stack.pop() + return f">\0 {text}{self._font_stack[-1]}" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._enter_block() + lst = self._list_stack[-1] + maybe_space = '' if lst.compact or not lst.first_item_seen else '.sp\n' + lst.first_item_seen = True + head = "•" + if lst.next_idx is not None: + head = f"{lst.next_idx}." + lst.next_idx += 1 + return ( + f'{maybe_space}' + f'.RS {lst.width}\n' + f"\\h'-{len(head) + 1}'\\fB{man_escape(head)}\\fP\\h'1'\\c" + ) + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return ".RE" + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.append(List(width=4, compact=bool(token.meta['compact']))) + return self._maybe_parbreak() + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.append("\\fI") + return "\\fI" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.pop() + return self._font_stack[-1] + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.append("\\fB") + return "\\fB" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.pop() + return self._font_stack[-1] + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + s = man_escape(token.content).rstrip('\n') + return ( + '.sp\n' + '.RS 4\n' + '.nf\n' + f'{s}\n' + '.fi\n' + '.RE' + ) + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + maybe_par = self._maybe_parbreak("\n") + self._enter_block() + return ( + f"{maybe_par}" + ".RS 4\n" + f"\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c" + ) + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return ".RE" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Note") + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Caution") + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Important") + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Tip") + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Warning") + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".RS 4" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".RE" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".PP" + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._enter_block() + return ".RS 4" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return ".RE" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if token.meta['name'] in [ 'command', 'env', 'option' ]: + return f'\\fB{man_escape(token.content)}\\fP' + elif token.meta['name'] in [ 'file', 'var' ]: + return f'\\fI{man_escape(token.content)}\\fP' + elif token.meta['name'] == 'manpage': + [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] + section = section[:-1] + return f'\\fB{man_escape(page)}\\fP\\fR({man_escape(section)})\\fP' + else: + raise NotImplementedError("md node not supported yet", token) + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" # mdoc knows no anchors + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in manpages", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in manpages", token) + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # max item head width for a number, a dot, and one leading space and one trailing space + width = 3 + len(str(cast(int, token.meta['end']))) + self._list_stack.append( + List(width = width, + next_idx = cast(int, token.attrs.get('start', 1)), + compact = bool(token.meta['compact']))) + return self._maybe_parbreak() + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py index 361bc08778..8c2d414575 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py @@ -3,6 +3,7 @@ import json from abc import abstractmethod from collections.abc import MutableMapping, Sequence +from pathlib import Path from typing import Any, cast, NamedTuple, Optional, Union from xml.sax.saxutils import escape, quoteattr from markdown_it.token import Token @@ -26,11 +27,15 @@ class BaseConverter(Converter): super().__init__(manpage_urls) self._sections = [] - def add_section(self, id: Optional[str], chapters: list[str]) -> None: + def add_section(self, id: Optional[str], chapters: list[Path]) -> None: self._sections.append(RenderedSection(id)) - for content in chapters: - self._md.renderer._title_seen = False # type: ignore[attr-defined] - self._sections[-1].chapters.append(self._render(content)) + for chpath in chapters: + try: + with open(chpath, 'r') as f: + self._md.renderer._title_seen = False # type: ignore[attr-defined] + self._sections[-1].chapters.append(self._render(f.read())) + except Exception as e: + raise RuntimeError(f"failed to render manual chapter {chpath}") from e @abstractmethod def finalize(self) -> str: raise NotImplementedError() @@ -45,7 +50,13 @@ class ManualDocBookRenderer(DocBookRenderer): (tag, attrs) = super()._heading_tag(token, tokens, i, options, env) if self._title_seen: if token.tag == 'h1': - raise RuntimeError("only one title heading allowed", token) + assert token.map is not None + raise RuntimeError( + "only one title heading (# [text...]) allowed per manual chapter " + f"but found a second in lines [{token.map[0]}..{token.map[1]}]. " + "please remove all such headings except the first, split your " + "chapters, or demote the subsequent headings to (##) or lower.", + token) return (tag, attrs) self._title_seen = True return ("chapter", attrs | { @@ -111,7 +122,7 @@ class ChaptersAction(argparse.Action): values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: sections = getattr(ns, self.dest) if sections is None: raise argparse.ArgumentError(self, "no active section") - sections[-1].chapters.extend(cast(Sequence[str], values)) + sections[-1].chapters.extend(map(Path, cast(Sequence[str], values))) def _build_cli_db(p: argparse.ArgumentParser) -> None: p.add_argument('--manpage-urls', required=True) @@ -124,11 +135,7 @@ def _run_cli_db(args: argparse.Namespace) -> None: with open(args.manpage_urls, 'r') as manpage_urls: md = DocBookConverter(json.load(manpage_urls)) for section in args.contents: - chapters = [] - for p in section.chapters: - with open(p, 'r') as f: - chapters.append(f.read()) - md.add_section(section.id, chapters) + md.add_section(section.id, section.chapters) with open(args.outfile, 'w') as f: f.write(md.finalize()) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py index c08675870f..5bc16e6593 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py @@ -1,7 +1,7 @@ from abc import ABC from collections.abc import Mapping, MutableMapping, Sequence from frozendict import frozendict # type: ignore[attr-defined] -from typing import Any, Callable, Optional +from typing import Any, Callable, cast, Iterable, Optional import re @@ -79,6 +79,11 @@ class Renderer(markdown_it.renderer.RendererProtocol): } self._admonition_stack = [] + def _join_block(self, ls: Iterable[str]) -> str: + return "".join(ls) + def _join_inline(self, ls: Iterable[str]) -> str: + return "".join(ls) + def admonition_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: tag = token.info.strip() @@ -98,7 +103,7 @@ class Renderer(markdown_it.renderer.RendererProtocol): return self.rules[token.type](tokens[i], tokens, i, options, env) else: raise NotImplementedError("md token not supported yet", token) - return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + return self._join_block(map(lambda arg: do_one(*arg), enumerate(tokens))) def renderInline(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping[str, Any]) -> str: def do_one(i: int, token: Token) -> str: @@ -106,7 +111,7 @@ class Renderer(markdown_it.renderer.RendererProtocol): return self.rules[token.type](tokens[i], tokens, i, options, env) else: raise NotImplementedError("md token not supported yet", token) - return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + return self._join_inline(map(lambda arg: do_one(*arg), enumerate(tokens))) def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: @@ -364,14 +369,21 @@ class Converter(ABC): # of each item to hidden. this is not useful for our stylesheets, which # signify this with a special css class on list elements instead. wide_stack = [] + end_stack = [] for i in range(0, len(tokens)): if tokens[i].type in [ 'bullet_list_open', 'ordered_list_open' ]: wide_stack.append([i, True]) + end_stack.append([i, cast(int, tokens[i].attrs.get('start', 1))]) elif tokens[i].type in [ 'bullet_list_close', 'ordered_list_close' ]: (idx, compact) = wide_stack.pop() - tokens[idx].attrs['compact'] = compact + tokens[idx].meta['compact'] = compact + (idx, end) = end_stack.pop() + if tokens[i].type == 'ordered_list_close': + tokens[idx].meta['end'] = end - 1 elif len(wide_stack) > 0 and tokens[i].type == 'paragraph_open' and not tokens[i].hidden: wide_stack[-1][1] = False + elif tokens[i].type == 'list_item_open': + end_stack[-1][1] += 1 return tokens @@ -379,7 +391,7 @@ class Converter(ABC): tokens = self._md.parse(src, env if env is not None else {}) return self._post_parse(tokens) - def _render(self, src: str) -> str: - env: dict[str, Any] = {} + def _render(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> str: + env = {} if env is None else env tokens = self._parse(src, env) return self._md.renderer.render(tokens, self._md.options, env) # type: ignore[no-any-return] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py index 3667c7bbcd..95091d3cdd 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -2,13 +2,16 @@ import argparse import json from abc import abstractmethod -from collections.abc import MutableMapping, Sequence +from collections.abc import Mapping, MutableMapping, Sequence from markdown_it.utils import OptionsDict from markdown_it.token import Token from typing import Any, Optional from xml.sax.saxutils import escape, quoteattr +import markdown_it + from .docbook import DocBookRenderer, make_xml_id +from .manpage import ManpageRenderer, man_escape from .md import Converter, md_escape from .types import OptionLoc, Option, RenderedOption @@ -22,22 +25,24 @@ def option_is(option: Option, key: str, typ: str) -> Optional[dict[str, str]]: return option[key] # type: ignore[return-value] class BaseConverter(Converter): + __option_block_separator__: str + _options: dict[str, RenderedOption] def __init__(self, manpage_urls: dict[str, str], revision: str, - document_type: str, - varlist_id: str, - id_prefix: str, markdown_by_default: bool): super().__init__(manpage_urls) self._options = {} self._revision = revision - self._document_type = document_type - self._varlist_id = varlist_id - self._id_prefix = id_prefix self._markdown_by_default = markdown_by_default + def _sorted_options(self) -> list[tuple[str, RenderedOption]]: + keys = list(self._options.keys()) + keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) + for p in self._options[opt].loc ]) + return [ (k, self._options[k]) for k in keys ] + def _format_decl_def_loc(self, loc: OptionLoc) -> tuple[Optional[str], str]: # locations can be either plain strings (specific to nixpkgs), or attrsets # { name = "foo/bar.nix"; url = "https://github.com/....."; } @@ -107,9 +112,9 @@ class BaseConverter(Converter): def _render_description(self, desc: str | dict[str, str]) -> list[str]: if isinstance(desc, str) and self._markdown_by_default: - return [ self._render(desc) ] + return [ self._render(desc) ] if desc else [] elif isinstance(desc, dict) and desc.get('_type') == 'mdDoc': - return [ self._render(desc['text']) ] + return [ self._render(desc['text']) ] if desc['text'] else [] else: raise Exception("description has unrecognized type", desc) @@ -117,33 +122,41 @@ class BaseConverter(Converter): def _related_packages_header(self) -> list[str]: raise NotImplementedError() def _convert_one(self, option: dict[str, Any]) -> list[str]: - result = [] + blocks: list[list[str]] = [] if desc := option.get('description'): - result += self._render_description(desc) + blocks.append(self._render_description(desc)) if typ := option.get('type'): ro = " *(read only)*" if option.get('readOnly', False) else "" - result.append(self._render(f"*Type:* {md_escape(typ)}{ro}")) + blocks.append([ self._render(f"*Type:*\n{md_escape(typ)}{ro}") ]) - result += self._render_code(option, 'default') - result += self._render_code(option, 'example') + if option.get('default'): + blocks.append(self._render_code(option, 'default')) + if option.get('example'): + blocks.append(self._render_code(option, 'example')) if related := option.get('relatedPackages'): - result += self._related_packages_header() - result.append(self._render(related)) + blocks.append(self._related_packages_header()) + blocks[-1].append(self._render(related)) if decl := option.get('declarations'): - result += self._render_decl_def("Declared by", decl) + blocks.append(self._render_decl_def("Declared by", decl)) if defs := option.get('definitions'): - result += self._render_decl_def("Defined by", defs) + blocks.append(self._render_decl_def("Defined by", defs)) - return result + for part in [ p for p in blocks[0:-1] if p ]: + part.append(self.__option_block_separator__) + + return [ l for part in blocks for l in part ] + + def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: + try: + return RenderedOption(option['loc'], self._convert_one(option)) + except Exception as e: + raise Exception(f"Failed to render option {name}") from e def add_options(self, options: dict[str, Any]) -> None: for (name, option) in options.items(): - try: - self._options[name] = RenderedOption(option['loc'], self._convert_one(option)) - except Exception as e: - raise Exception(f"Failed to render option {name}") from e + self._options[name] = self._render_option(name, option) @abstractmethod def finalize(self) -> str: raise NotImplementedError() @@ -159,15 +172,27 @@ class OptionsDocBookRenderer(DocBookRenderer): # TODO keep optionsDocBook diff small. remove soon if rendering is still good. def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: - token.attrs['compact'] = False + token.meta['compact'] = False return super().ordered_list_open(token, tokens, i, options, env) def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: - token.attrs['compact'] = False + token.meta['compact'] = False return super().bullet_list_open(token, tokens, i, options, env) class DocBookConverter(BaseConverter): __renderer__ = OptionsDocBookRenderer + __option_block_separator__ = "" + + def __init__(self, manpage_urls: dict[str, str], + revision: str, + markdown_by_default: bool, + document_type: str, + varlist_id: str, + id_prefix: str): + super().__init__(manpage_urls, revision, markdown_by_default) + self._document_type = document_type + self._varlist_id = varlist_id + self._id_prefix = id_prefix def _render_code(self, option: dict[str, Any], key: str) -> list[str]: if lit := option_is(option, key, 'literalDocBook'): @@ -207,10 +232,6 @@ class DocBookConverter(BaseConverter): return [ "" ] def finalize(self) -> str: - keys = list(self._options.keys()) - keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) - for p in self._options[opt].loc ]) - result = [] result.append('') @@ -227,7 +248,7 @@ class DocBookConverter(BaseConverter): f' xml:id="{self._varlist_id}">', ] - for name in keys: + for (name, opt) in self._sorted_options(): id = make_xml_id(self._id_prefix + name) result += [ "", @@ -236,7 +257,7 @@ class DocBookConverter(BaseConverter): f""), "" ] - result += self._options[name].lines + result += opt.lines result += [ "", "" @@ -248,6 +269,125 @@ class DocBookConverter(BaseConverter): return "\n".join(result) +class OptionsManpageRenderer(ManpageRenderer): + pass + +class ManpageConverter(BaseConverter): + def __renderer__(self, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt] = None) -> OptionsManpageRenderer: + return OptionsManpageRenderer(manpage_urls, self._options_by_id, parser) + + __option_block_separator__ = ".sp" + + _options_by_id: dict[str, str] + _links_in_last_description: Optional[list[str]] = None + + def __init__(self, revision: str, markdown_by_default: bool): + self._options_by_id = {} + super().__init__({}, revision, markdown_by_default) + + def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: + assert isinstance(self._md.renderer, OptionsManpageRenderer) + links = self._md.renderer.link_footnotes = [] + result = super()._render_option(name, option) + self._md.renderer.link_footnotes = None + return result._replace(links=links) + + def add_options(self, options: dict[str, Any]) -> None: + for (k, v) in options.items(): + self._options_by_id[f'#{make_xml_id(f"opt-{k}")}'] = k + return super().add_options(options) + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + if lit := option_is(option, key, 'literalDocBook'): + raise RuntimeError("can't render manpages in the presence of docbook") + else: + assert isinstance(self._md.renderer, OptionsManpageRenderer) + try: + self._md.renderer.inline_code_is_quoted = False + return super()._render_code(option, key) + finally: + self._md.renderer.inline_code_is_quoted = True + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + if isinstance(desc, str) and not self._markdown_by_default: + raise RuntimeError("can't render manpages in the presence of docbook") + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ + '\\fIRelated packages:\\fP', + '.sp', + ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ + f'\\fI{man_escape(header)}:\\fP', + ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + return [ + '.RS 4', + f'\\fB{man_escape(name)}\\fP', + '.RE' + ] + + def _decl_def_footer(self) -> list[str]: + return [] + + def finalize(self) -> str: + result = [] + + result += [ + r'''.TH "CONFIGURATION\&.NIX" "5" "01/01/1980" "NixOS" "NixOS Reference Pages"''', + r'''.\" disable hyphenation''', + r'''.nh''', + r'''.\" disable justification (adjust text to left margin only)''', + r'''.ad l''', + r'''.\" enable line breaks after slashes''', + r'''.cflags 4 /''', + r'''.SH "NAME"''', + self._render('{file}`configuration.nix` - NixOS system configuration specification'), + r'''.SH "DESCRIPTION"''', + r'''.PP''', + self._render('The file {file}`/etc/nixos/configuration.nix` contains the ' + 'declarative specification of your NixOS system configuration. ' + 'The command {command}`nixos-rebuild` takes this file and ' + 'realises the system configuration specified therein.'), + r'''.SH "OPTIONS"''', + r'''.PP''', + self._render('You can use the following options in {file}`configuration.nix`.'), + ] + + for (name, opt) in self._sorted_options(): + result += [ + ".PP", + f"\\fB{man_escape(name)}\\fR", + ".RS 4", + ] + result += opt.lines + if links := opt.links: + result.append(self.__option_block_separator__) + md_links = "" + for i in range(0, len(links)): + md_links += "\n" if i > 0 else "" + if links[i].startswith('#opt-'): + md_links += f"{i+1}. see the {{option}}`{self._options_by_id[links[i]]}` option" + else: + md_links += f"{i+1}. " + md_escape(links[i]) + result.append(self._render(md_links)) + + result.append(".RE") + + result += [ + r'''.SH "AUTHORS"''', + r'''.PP''', + r'''Eelco Dolstra and the Nixpkgs/NixOS contributors''', + ] + + return "\n".join(result) + def _build_cli_db(p: argparse.ArgumentParser) -> None: p.add_argument('--manpage-urls', required=True) p.add_argument('--revision', required=True) @@ -258,27 +398,47 @@ def _build_cli_db(p: argparse.ArgumentParser) -> None: p.add_argument("infile") p.add_argument("outfile") +def _build_cli_manpage(p: argparse.ArgumentParser) -> None: + p.add_argument('--revision', required=True) + p.add_argument("infile") + p.add_argument("outfile") + def _run_cli_db(args: argparse.Namespace) -> None: with open(args.manpage_urls, 'r') as manpage_urls: md = DocBookConverter( json.load(manpage_urls), revision = args.revision, + markdown_by_default = args.markdown_by_default, document_type = args.document_type, varlist_id = args.varlist_id, - id_prefix = args.id_prefix, - markdown_by_default = args.markdown_by_default) + id_prefix = args.id_prefix) with open(args.infile, 'r') as f: md.add_options(json.load(f)) with open(args.outfile, 'w') as f: f.write(md.finalize()) +def _run_cli_manpage(args: argparse.Namespace) -> None: + md = ManpageConverter( + revision = args.revision, + # manpage rendering only works if there's no docbook, so we can + # also set markdown_by_default with no ill effects. + markdown_by_default = True) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + def build_cli(p: argparse.ArgumentParser) -> None: formats = p.add_subparsers(dest='format', required=True) _build_cli_db(formats.add_parser('docbook')) + _build_cli_manpage(formats.add_parser('manpage')) def run_cli(args: argparse.Namespace) -> None: if args.format == 'docbook': _run_cli_db(args) + elif args.format == 'manpage': + _run_cli_manpage(args) else: raise RuntimeError('format not hooked up', args) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py index 7814b3a485..d20e056aac 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py @@ -7,7 +7,9 @@ from markdown_it.utils import OptionsDict OptionLoc = str | dict[str, str] Option = dict[str, str | dict[str, str] | list[OptionLoc]] -RenderedOption = NamedTuple('RenderedOption', [('loc', list[str]), - ('lines', list[str])]) +class RenderedOption(NamedTuple): + loc: list[str] + lines: list[str] + links: Optional[list[str]] = None RenderFn = Callable[[Token, Sequence[Token], int, OptionsDict, MutableMapping[str, Any]], str] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py new file mode 100644 index 0000000000..73a64fde83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py @@ -0,0 +1,62 @@ +sample1 = """\ +:::: {.warning} +foo +::: {.note} +nested +::: +:::: + +[ + multiline +](link) + +{manpage}`man(1)` reference + +[some [nested]{#a} anchors]{#b} + +*emph* **strong** *nesting emph **and strong** and `code`* + +- wide bullet + +- list + +1. wide ordered + +2. list + +- narrow bullet +- list + +1. narrow ordered +2. list + +> quotes +>> with *nesting* +>> +>> nested code block +> +> - and lists +> - ``` +> containing code +> ``` +> +> and more quote + +100. list starting at 100 +1. goes on + +deflist +: > with a quote + > and stuff + + code block + + ``` + fenced block + ``` + + text + +more stuff in same deflist +: foo +""" diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py index 0f5d284073..660c410a85 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py @@ -13,9 +13,11 @@ def test_list_wide(ordered: bool) -> None: ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") ) c = Converter({}) + meta = { 'end': int(e2[:-1]) } if ordered else {} + meta['compact'] = False assert c._parse(f"{e1} a\n\n{e2} b") == [ - Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': False}, map=[0, 3], level=0, - children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 3], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 2], level=1, children=None, content='', markup=m, info=i1, meta={}, block=True, hidden=False), Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, @@ -54,9 +56,11 @@ def test_list_narrow(ordered: bool) -> None: ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") ) c = Converter({}) + meta = { 'end': int(e2[:-1]) } if ordered else {} + meta['compact'] = True assert c._parse(f"{e1} a\n{e2} b") == [ - Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, - children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, content='', markup=m, info=i1, meta={}, block=True, hidden=False), Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, @@ -89,12 +93,12 @@ def test_list_narrow(ordered: bool) -> None: content='', markup=m, info='', meta={}, block=True, hidden=False) ] assert c._parse(f"{e1} - a\n{e2} b") == [ - Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, - children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, content='', markup=m, info=i1, meta={}, block=True, hidden=False), - Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[0, 1], level=2, - children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={'compact': True}, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, @@ -131,12 +135,12 @@ def test_list_narrow(ordered: bool) -> None: content='', markup=m, info='', meta={}, block=True, hidden=False) ] assert c._parse(f"{e1} - a\n{e2} - b") == [ - Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, - children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, content='', markup=m, info=i1, meta={}, block=True, hidden=False), - Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[0, 1], level=2, - children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={'compact': True}, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, @@ -157,8 +161,8 @@ def test_list_narrow(ordered: bool) -> None: content='', markup=m, info='', meta={}, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, content='', markup=m, info=i2, meta={}, block=True, hidden=False), - Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[1, 2], level=2, - children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={}, map=[1, 2], level=2, + children=None, content='', markup='-', info='', meta={'compact': True}, block=True, hidden=False), Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=3, children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=4, children=None, diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py new file mode 100644 index 0000000000..fbfd21358a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py @@ -0,0 +1,177 @@ +import nixos_render_docs + +from sample_md import sample1 + +from typing import Mapping, Optional + +import markdown_it + +class Converter(nixos_render_docs.md.Converter): + def __renderer__(self, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt] = None + ) -> nixos_render_docs.manpage.ManpageRenderer: + return nixos_render_docs.manpage.ManpageRenderer(manpage_urls, self.options_by_id, parser) + + def __init__(self, manpage_urls: Mapping[str, str], options_by_id: dict[str, str] = {}): + self.options_by_id = options_by_id + super().__init__(manpage_urls) + +def test_inline_code() -> None: + c = Converter({}) + assert c._render("1 `x a x` 2") == "1 \\fR\\(oqx a x\\(cq\\fP 2" + +def test_fonts() -> None: + c = Converter({}) + assert c._render("*a **b** c*") == "\\fIa \\fBb\\fI c\\fR" + assert c._render("*a [1 `2`](3) c*") == "\\fIa \\fB1 \\fR\\(oq2\\(cq\\fP\\fI c\\fR" + +def test_expand_link_targets() -> None: + c = Converter({}, { '#foo1': "bar", "#foo2": "bar" }) + assert (c._render("[a](#foo1) [](#foo2) [b](#bar1) [](#bar2)") == + "\\fBa\\fR \\fBbar\\fR \\fBb\\fR \\fB\\fR") + +def test_collect_links() -> None: + c = Converter({}, { '#foo': "bar" }) + assert isinstance(c._md.renderer, nixos_render_docs.manpage.ManpageRenderer) + c._md.renderer.link_footnotes = [] + assert c._render("[a](link1) [b](link2)") == "\\fBa\\fR[1]\\fR \\fBb\\fR[2]\\fR" + assert c._md.renderer.link_footnotes == ['link1', 'link2'] + +def test_dedup_links() -> None: + c = Converter({}, { '#foo': "bar" }) + assert isinstance(c._md.renderer, nixos_render_docs.manpage.ManpageRenderer) + c._md.renderer.link_footnotes = [] + assert c._render("[a](link) [b](link)") == "\\fBa\\fR[1]\\fR \\fBb\\fR[1]\\fR" + assert c._md.renderer.link_footnotes == ['link'] + +def test_full() -> None: + c = Converter({ 'man(1)': 'http://example.org' }) + assert c._render(sample1) == """\ +.sp +.RS 4 +\\fBWarning\\fP +.br +foo +.sp +.RS 4 +\\fBNote\\fP +.br +nested +.RE +.RE +.sp +\\fBmultiline\\fR +.sp +\\fBman\\fP\\fR(1)\\fP reference +.sp +some nested anchors +.sp +\\fIemph\\fR \\fBstrong\\fR \\fInesting emph \\fBand strong\\fI and \\fR\\(oqcode\\(cq\\fP\\fR +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +wide bullet +.RE +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-3'\\fB1\\&.\\fP\\h'1'\\c +wide ordered +.RE +.sp +.RS 4 +\\h'-3'\\fB2\\&.\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +narrow bullet +.RE +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-3'\\fB1\\&.\\fP\\h'1'\\c +narrow ordered +.RE +.RS 4 +\\h'-3'\\fB2\\&.\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c +quotes +.sp +.RS 4 +\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c +with \\fInesting\\fR +.sp +.RS 4 +.nf +nested code block +.fi +.RE +.RE +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +and lists +.RE +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +.sp +.RS 4 +.nf +containing code +.fi +.RE +.RE +.sp +and more quote +.RE +.sp +.RS 6 +\\h'-5'\\fB100\\&.\\fP\\h'1'\\c +list starting at 100 +.RE +.RS 6 +\\h'-5'\\fB101\\&.\\fP\\h'1'\\c +goes on +.RE +.RS 4 +.PP +deflist +.RS 4 +.RS 4 +\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c +with a quote and stuff +.RE +.sp +.RS 4 +.nf +code block +.fi +.RE +.sp +.RS 4 +.nf +fenced block +.fi +.RE +.sp +text +.RE +.PP +more stuff in same deflist +.RS 4 +foo +.RE +.RE""" diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py index 5a02fabde0..9608ed6392 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py @@ -4,7 +4,7 @@ from markdown_it.token import Token import pytest def test_option_headings() -> None: - c = nixos_render_docs.options.DocBookConverter({}, 'local', 'none', 'vars', 'opt-', False) + c = nixos_render_docs.options.DocBookConverter({}, 'local', False, 'none', 'vars', 'opt-') with pytest.raises(RuntimeError) as exc: c._render("# foo") assert exc.value.args[0] == 'md token not supported in options doc' diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index b42144762b..2d028a0e63 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZbKkyRCzfnX8TPBeUYZk2b5M//g1cyiksUMBg0z7nlQ="; + sha256 = "sha256-Mu0/mWkdrhaybI0iAB/MuD7UTbDDC73ZMxr8kU7R23I="; }; - vendorHash = "sha256-TrJtuFzreIjq7fCw/XT1jniw9Ey9k6xmXotby6A651g="; + vendorHash = "sha256-YDV816jTLAqbSjiKXvbkwPbPCLPplH+NFN1SCVjWcbk="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix index cfc23ff619..3d42d4907e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-8nFseSTAIGJdB4P/K/cXAehvdrSLcTTBZLQNs/ZC+I8="; + hash = "sha256-O0Ro9vwf2kDhGFs32puQIeW/rSSduC9sD5zV8e/GtvA="; }; buildInputs = [ boost diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix index 069b6f24ea..eaaa2dc57d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix @@ -1,13 +1,13 @@ { lib -, stdenv , python3 -, fetchFromGitHub -, installShellFiles }: let python = python3.override { packageOverrides = self: super: { + poetry = self.callPackage ./unwrapped.nix { }; + + # version overrides required by poetry and its plugins dulwich = super.dulwich.overridePythonAttrs (old: rec { version = "0.20.50"; src = self.fetchPypi { @@ -18,118 +18,30 @@ let }); }; }; -in python.pkgs.buildPythonApplication rec { - pname = "poetry"; - version = "1.3.2"; - format = "pyproject"; - disabled = python.pkgs.pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "python-poetry"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + plugins = with python.pkgs; { + poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { }; + poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { }; }; - nativeBuildInputs = [ - installShellFiles - ]; + # selector is a function mapping pythonPackages to a list of plugins + # e.g. poetry.withPlugins (ps: with ps; [ poetry-plugin-up ]) + withPlugins = selector: let + selected = selector plugins; + in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selected; - propagatedBuildInputs = with python.pkgs; [ - cachecontrol - cleo - crashtest - dulwich - filelock - html5lib - jsonschema - keyring - packaging - pexpect - pkginfo - platformdirs - poetry-core - poetry-plugin-export - requests - requests-toolbelt - shellingham - tomlkit - trove-classifiers - virtualenv - ] ++ lib.optionals (stdenv.isDarwin) [ - xattr - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.8") [ - backports-cached-property - ] ++ cachecontrol.optional-dependencies.filecache; + # save some build time when adding plugins by disabling tests + doCheck = selected == [ ]; - postInstall = '' - installShellCompletion --cmd poetry \ - --bash <($out/bin/poetry completions bash) \ - --fish <($out/bin/poetry completions fish) \ - --zsh <($out/bin/poetry completions zsh) \ - ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - - nativeCheckInputs = with python.pkgs; [ - cachy - deepdiff - flatdict - pytestCheckHook - httpretty - pytest-mock - pytest-xdist - ]; - - preCheck = ('' - export HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 - export no_proxy='*'; - ''); - - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - unset no_proxy - ''; - - disabledTests = [ - # touches network - "git" - "solver" - "load" - "vcs" - "prereleases_if_they_are_compatible" - "test_executor" - # requires git history to work correctly - "default_with_excluded_data" - # toml ordering has changed - "lock" - # fs permission errors - "test_builder_should_execute_build_scripts" - ] ++ lib.optionals (python.pythonAtLeast "3.10") [ - # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended - "test_info_setup_complex_pep517_error" - ]; - - # Allow for package to use pep420's native namespaces - pythonNamespaces = [ - "poetry" - ]; - - meta = with lib; { - changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; - homepage = "https://python-poetry.org/"; - description = "Python dependency management and packaging made easy"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum dotlambda ]; - }; -} + passthru = rec { + inherit plugins withPlugins; + }; + })); +in withPlugins (ps: [ ]) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix new file mode 100644 index 0000000000..85eb0b5d19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, poetry +, safety +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "poetry-audit-plugin"; + version = "0.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "opeco17"; + repo = "poetry-audit-plugin"; + rev = "refs/tags/${version}"; + hash = "sha256-49OnYz3EFiqOe+cLgfynjy14Ve4Ga6OUrLdM8HhZuKQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + safety + ]; + + pythonImportsCheck = [ "poetry_audit_plugin" ]; + + nativeCheckInputs = [ + poetry # for the executable + pytestCheckHook + ]; + + # requires networking + doCheck = false; + + meta = { + description = "Poetry plugin for checking security vulnerabilities in dependencies"; + homepage = "https://github.com/opeco17/poetry-audit-plugin"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix new file mode 100644 index 0000000000..e84546573d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytestCheckHook +, pytest-mock +, poetry +}: + +buildPythonPackage rec { + pname = "poetry-plugin-up"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "MousaZeidBaker"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-16p0emvgWa56Km8U5HualCSStbulqyINbC3Jez9Y1n0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + poetry + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Poetry plugin to simplify package updates"; + homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up"; + changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.k900 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix new file mode 100644 index 0000000000..e98c571ddb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix @@ -0,0 +1,149 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, installShellFiles +, cachecontrol +, cleo +, crashtest +, dulwich +, filelock +, html5lib +, jsonschema +, keyring +, packaging +, pexpect +, pkginfo +, platformdirs +, poetry-core +, poetry-plugin-export +, requests +, requests-toolbelt +, shellingham +, tomlkit +, trove-classifiers +, virtualenv +, xattr +, tomli +, importlib-metadata +, backports-cached-property +, cachy +, deepdiff +, flatdict +, pytestCheckHook +, httpretty +, pytest-mock +, pytest-xdist +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "poetry"; + version = "1.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + cachecontrol + cleo + crashtest + dulwich + filelock + html5lib + jsonschema + keyring + packaging + pexpect + pkginfo + platformdirs + poetry-core + poetry-plugin-export + requests + requests-toolbelt + shellingham + tomlkit + trove-classifiers + virtualenv + ] ++ lib.optionals (stdenv.isDarwin) [ + xattr + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.8") [ + backports-cached-property + ] ++ cachecontrol.optional-dependencies.filecache; + + postInstall = '' + installShellCompletion --cmd poetry \ + --bash <($out/bin/poetry completions bash) \ + --fish <($out/bin/poetry completions fish) \ + --zsh <($out/bin/poetry completions zsh) \ + ''; + + nativeCheckInputs = [ + cachy + deepdiff + flatdict + pytestCheckHook + httpretty + pytest-mock + pytest-xdist + ]; + + preCheck = ('' + export HOME=$TMPDIR + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 + export no_proxy='*'; + ''); + + postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + unset no_proxy + ''; + + disabledTests = [ + # touches network + "git" + "solver" + "load" + "vcs" + "prereleases_if_they_are_compatible" + "test_executor" + # requires git history to work correctly + "default_with_excluded_data" + # toml ordering has changed + "lock" + # fs permission errors + "test_builder_should_execute_build_scripts" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended + "test_info_setup_complex_pep517_error" + ]; + + # Allow for package to use pep420's native namespaces + pythonNamespaces = [ + "poetry" + ]; + + meta = with lib; { + changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://python-poetry.org/"; + description = "Python dependency management and packaging made easy"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/xbps/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/xbps/default.nix index 46aaf4a94d..eb71b51478 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/xbps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libarchive ]; - patches = [ ./cert-paths.patch ]; + patches = [ + ./cert-paths.patch + # fix openssl 3 + (fetchpatch { + url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch"; + hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ="; + }) + ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations"; postPatch = '' # fix unprefixed ranlib (needed on cross) diff --git a/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix new file mode 100644 index 0000000000..785caa8f53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "argocd-vault-plugin"; + version = "1.13.1"; + + src = fetchFromGitHub { + owner = "argoproj-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BuPNmGWKvjWkMCyyAFZeSCcnBUeaoduw7fZe07WD3Jo="; + }; + + vendorHash = "sha256-jxuYT63FxylQinJ9paPk/Ut0aFX5gdLOS4ugzrtRIF0="; + + # integration tests require filesystem and network access for credentials + doCheck = false; + + meta = with lib; { + homepage = "https://argocd-vault-plugin.readthedocs.io"; + changelog = "https://github.com/argoproj-labs/argocd-vault-plugin/releases/tag/v${version}"; + description = "An Argo CD plugin to retrieve secrets from Secret Management tools and inject them into Kubernetes secrets"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix index 103c8aceed..8180f9013d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-fvRSx/I4SM9xWhooPPKFuRLSCYOxE+scqi6jRsGFOXo="; + sha256 = "sha256-A5enH7JqnLZ9Tte+FMpMVqq1g1JveYJbzH1Qum5In5E="; }; - cargoSha256 = "sha256-5wXeFomQs/aEbImmlyUzmYyDRXFp3qZSFOzk0g7pNEo="; + cargoHash = "sha256-LVc7CgRS57p7TUaTo8L94YArYC7eI0wegzNMcTiJrEg="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index f265444f53..884be46505 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "2022.12.0"; + version = "2023.1.1"; src = fetchurl { url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-deQG1GEYmnQmO5+jASsiQmDphb+4Jyq9aSn/A4z++uE="; + sha256 = "sha256-bL3ybErpY5jeCixF8qtU/DQ35xU+43K9aXreHsoCF7Q="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix b/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix index 8bf3e6983b..589e1f97e6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "certipy"; - version = "2.0.9"; + version = "4.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; - rev = version; - hash = "sha256-84nGRKZ0UlMDAZ1Wo5Hgy9XSAyEh0Tio9+3OZVFZG5k="; + rev = "refs/tags/${version}"; + hash = "sha256-vwlWAbA4ExYAPRInhEsjRCNuL2wqMhAmYKO78Vi4OGo="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -22,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { ldap3 pyasn1 pycryptodome + requests_ntlm ]; # Project has no tests @@ -34,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services"; homepage = "https://github.com/ly4k/Certipy"; + changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 3330d20ac3..e61649c767 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.53.1"; + version = "3.54.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ZgXUnHYaWRBjAW/k74o93SIJJbcI3zlw5GmwXE6Ri8U="; + sha256 = "sha256-R+mvifWHyUL8qBCKKFcn4x9eDoPi4qRuGPnoRS4QlQY="; }; vendorHash = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; diff --git a/third_party/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix b/third_party/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix index d583286939..2c9ab122e6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "enum4linux-ng"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "cddmp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-InE0VRk9hK7JEKL202/2RclrJHAHFAol3DxKnVA+lq4="; + hash = "sha256-qO34sVK8eunALPCzLoCqWkO78tG4iEavij8jClCRi88="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 9718f0095d..a710daca60 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-11-22"; + version = "2023-02-03"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G871FvwekcF5uMq7NRoWuIb9UqzIbMniboKlUzgCaeI="; + hash = "sha256-uTyUACY9Pm+gMuLrttGCNZ/UQaOW/h12ysY/noTkw7A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix index 459f9f12c1..daa0e84711 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , python3 , fetchpatch +, installShellFiles }: python3.pkgs.buildPythonApplication rec { @@ -14,6 +15,10 @@ python3.pkgs.buildPythonApplication rec { sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE="; }; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles ]; + pythonPath = with python3.pkgs; lib.optionals stdenv.isLinux [ systemd @@ -71,6 +76,8 @@ python3.pkgs.buildPythonApplication rec { '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/etc" + + installManPage man/*.[1-9] '' + lib.optionalString stdenv.isLinux '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/usr" diff --git a/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix b/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix index 18862b7940..658df4348a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ffuf"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-dqABifXA104NCPdrWhB79cZQloJrqwJ45rlh+M/lRrs="; + sha256 = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk="; }; - vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; + vendorHash = "sha256-nqv45e1W7MA8ElsJ7b4XWs26OicJ7IXmh93+wkueZg4="; meta = with lib; { description = "Fast web fuzzer written in Go"; diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix index 2030e8195e..0f56c4a8c1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages +, nixosTests , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap , pinentry, readline, sqlite, zlib @@ -85,6 +86,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.connman = nixosTests.gnupg; + meta = with lib; { homepage = "https://gnupg.org"; description = "Modern release of the GNU Privacy Guard, a GPL OpenPGP implementation"; diff --git a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix index 8b68fedd59..46d296453f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotrue"; - version = "2.42.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-ZLonPW7lXaBE039R21DWjRBa7xxRnH9rTNu4PDNOWoY="; + hash = "sha256-LSA6h6hs5M80urBasVDWZSCNA3fWxjYjvbPRbHLOX0Y="; }; - vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU="; + vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix index 4ab4d468d0..486ee7ba65 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix @@ -6,6 +6,7 @@ , libgpg-error , libxcb , libxkbcommon +, pkg-config , python3 , AppKit , Foundation @@ -16,20 +17,21 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-eUUHH6bPfYjkHo7C7GWzewTpT8je7TQK9M8mTM5v59s="; + hash = "sha256-4Xi4ePFJL56HxCkbTlu4WiCTRzLEqvfbEk/2q9QjAd8="; }; - cargoHash = "sha256-GtSvDfG9lRUirm4d6PSaOBLTHZJT2PH0Sx/9GVquX5M="; + cargoHash = "sha256-MEj7c87msMv/+D70EDWmWEHTtmQcx5DEMf2I/AXnwm8="; nativeBuildInputs = [ gpgme # for gpgme-config libgpg-error # for gpg-error-config + pkg-config python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix b/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix index 2047b31122..95b126bce0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "iaito"; - version = "5.8.0"; + version = "5.8.2"; srcs = [ (fetchFromGitHub rec { owner = "radareorg"; repo = "iaito"; rev = version; - hash = "sha256-LqJu30Bp+JgB+y3MDyPVuFmEoXTpfA7K2pxv1ZCABx0="; + hash = "sha256-6Do06u9axqH+DpGASEce8j3iGlrkIZGv50seyazOo1w="; name = repo; }) (fetchFromGitHub rec { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { postBuild = '' pushd ../../../iaito-translations - make build PREFIX=$out + make build -j$NIX_BUILD_CORES PREFIX=$out popd ''; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { install -m644 -Dt $out/share/pixmaps ../img/iaito-o.svg pushd ../../../iaito-translations - make install PREFIX=$out -j$NIX_BUILD_CORES + make install -j$NIX_BUILD_CORES PREFIX=$out popd runHook postInstall diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix b/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix index 9492475aad..80be86403a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0rhs5MZzf9E848FxYuZdXTarYG1BwnfS9HDz9iYR/vo="; + sha256 = "sha256-fh7kVYajpn8DKteyvAJf3dk1UrSXFX2gKtTAvuiOjpY="; }; - vendorSha256 = "sha256-uaFEtWI5tdL0egaJPTKh7k66Kyjq+N8YDlUGJDtFRqY="; + vendorHash = "sha256-PM8VnPNMLhDhRVy6xafW0kuTHgd374r0Ol2U9k8LNIw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index c83c7fb4cf..345e36756f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -1,25 +1,37 @@ { lib +, stdenv , rustPlatform , fetchFromGitLab , pkg-config , nettle +, openssl +, darwin }: rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - hash = "sha256-liQNz833/3hi3eMi+/iEZ8fT9FFi+MrDIYbQD+dQ/p0="; + hash = "sha256-8aKT39gq6o7dnbhKbDxewd4R2e2IsbYU8vaDwYemes8="; }; - cargoHash = "sha256-bnScLSI94obYQH5YzoHY4DtGScKc4m24+SIg1d2kAKw="; + cargoHash = "sha256-Z6cXCHLrK+BcIeVCKH2l8n9SivZsZPhXGhaMObn6rjo="; - nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; - buildInputs = [ nettle ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + ]; + + buildInputs = [ + nettle + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # gpgconf: error creating socket directory doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix index 8a6cc97ff1..6ba2188432 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-zIF7R0zIoqQx0epTJAVdesT6IOoNek7Blt7W3Ulng4A="; + sha256 = "sha256-BDJEvA6kDBxE43+l2GGaGJxv1BETZGJ9poAqXg/NfOY="; }; - vendorHash = "sha256-JX5jUIMwd+eCYRytaf+EXV/xHh6CCS2Ia0K+UQZxG7E="; + vendorHash = "sha256-2uBrd1AJyKPJBgMp2ANng9dSjye3iTNaUg+tuLsKEts="; ldflags = [ "-buildid=" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index bc694986c8..fcd1487dfb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; - rev = "v${version}"; - hash = "sha256-XcMDdnqx64UcEzD44z34sm5TmshPOTb5tivBnGXQLjo="; + rev = "refs/tags/v${version}"; + hash = "sha256-EzdyJzUPoWcLux6RiEZL3DiB65T+pgY70bpD1fX1JN4="; }; - vendorHash = "sha256-HjWUV5gfh2WnUAayZIj6LGFs0rMv2n7v6zJJrzBHBwg="; + vendorHash = "sha256-yTndvnlCmXsQSpImcwuwSXB0WuF2naGJEHfU1iAJApM="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix index 6aec3dd105..49c0f8cd14 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.1.3"; + version = "3.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; - rev = version; - sha256 = "sha256-alrJVe4Miarkk8BziC8Y333b3swJ4b4oQpP2WAdT2rc="; + rev = "refs/tags/${version}"; + hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc="; }; propagatedBuildInputs = with python3.pkgs; [ aiocache aiosqlite + arsenic beautifulsoup4 brotli browser-cookie3 @@ -63,15 +64,15 @@ python3.pkgs.buildPythonApplication rec { "test_bad_separator_used" "test_blind" "test_chunked_timeout" - "test_cookies" - "test_drop_cookies" - "test_save_and_restore_state" - "test_explorer_extract_links" "test_cookies_detection" + "test_cookies" "test_csrf_cases" "test_detection" "test_direct" + "test_dom_detection" + "test_drop_cookies" "test_escape_with_style" + "test_explorer_extract_links" "test_explorer_filtering" "test_false" "test_frame" @@ -79,21 +80,21 @@ python3.pkgs.buildPythonApplication rec { "test_html_detection" "test_implies_detection" "test_inclusion_detection" + "test_merge_with_and_without_redirection" "test_meta_detection" + "test_multi_detection" "test_no_crash" "test_options" "test_out_of_band" - "test_multi_detection" - "test_vulnerabilities" "test_partial_tag_name_escape" "test_prefix_and_suffix_detection" "test_qs_limit" "test_rare_tag_and_event" "test_redirect_detection" "test_request_object" + "test_save_and_restore_state" "test_script" "test_ssrf" - "test_merge_with_and_without_redirection" "test_tag_name_escape" "test_timeout" "test_title_false_positive" @@ -102,6 +103,7 @@ python3.pkgs.buildPythonApplication rec { "test_unregistered_cname" "test_url_detection" "test_verify_dns" + "test_vulnerabilities" "test_warning" "test_whole" "test_xss_inside_tag_input" @@ -111,9 +113,12 @@ python3.pkgs.buildPythonApplication rec { "test_xss_with_weak_csp" "test_xxe" # Requires a PHP installation - "test_timesql" "test_cookies" + "test_loknop_lfi_to_rce" "test_redirect" + "test_timesql" + "test_xss_inside_href_link" + "test_xss_inside_src_iframe" # TypeError: Expected bytes or bytes-like object got: "test_persister_upload" ]; @@ -138,6 +143,7 @@ python3.pkgs.buildPythonApplication rec { if a script is vulnerable. ''; homepage = "https://wapiti-scanner.github.io/"; + changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/yatas/default.nix b/third_party/nixpkgs/pkgs/tools/security/yatas/default.nix new file mode 100644 index 0000000000..d42068fe68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/yatas/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "yatas"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "padok-team"; + repo = "YATAS"; + rev = "refs/tags/v${version}"; + hash = "sha256-BjcqEO+rDEjPttGgTH07XyQKLcs/O+FarKTWjqXWQOo="; + }; + + vendorHash = "sha256-QOFt9h4Hdt+Mx82yw4mjAoyUXHeprvjRoLYLBnihwJo="; + + meta = with lib; { + description = "Tool to audit AWS infrastructure for misconfiguration or potential security issues"; + homepage = "https://github.com/padok-team/YATAS"; + changelog = "https://github.com/padok-team/YATAS/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix b/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix index 83c2e53540..77b6b86ffd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix @@ -10,19 +10,31 @@ , pkg-config , pcsclite , help2man +, darwin +, libiconv }: stdenv.mkDerivation rec { pname = "yubihsm-shell"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = version; - sha256 = "sha256-rSIdI6ECLte+dEbT8NOUqS8jkozRhbo+eqFrdhTIKpY="; + hash = "sha256-zWhvECPdZnrbSAVPDVZk54SWHVkd/HEQxS3FgXoqXHY="; }; + postPatch = '' + # Can't find libyubihsm at runtime because of dlopen() in C code + substituteInPlace lib/yubihsm.c \ + --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \ + --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so" + # ld: unknown option: -z + substituteInPlace CMakeLists.txt cmake/SecurityFlags.cmake \ + --replace "AppleClang" "Clang" + ''; + nativeBuildInputs = [ pkg-config cmake @@ -34,16 +46,17 @@ stdenv.mkDerivation rec { libusb1 libedit curl - pcsclite openssl + ] ++ lib.optionals stdenv.isLinux [ + pcsclite + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.PCSC + libiconv ]; - postPatch = '' - # Can't find libyubihsm at runtime because of dlopen() in C code - substituteInPlace lib/yubihsm.c \ - --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \ - --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so" - ''; + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DDISABLE_LTO=ON" + ]; meta = with lib; { description = "yubihsm-shell and libyubihsm"; diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index 0d72541afe..ceee8c9efa 100644 --- a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.61"; + version = "1.0.62"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BAUvqRgcHVVFuTNX9W0PiYF3f1yd2mJxmE7It9as4gs="; + sha256 = "sha256-3T9/VAr/ZrGTZZK3rsIpnOeKdp9WxPO0JkGamDi3hyM="; }; - cargoHash = "sha256-baQP9GEkZx5dSm64GpQ0h5SKQUzZALyplRUKEKX0K8U="; + cargoHash = "sha256-rNMEXvAGpKxn2t6uvgTx3sc3tpGCXmzOM/iPWwWq2JM="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index 9fcdfa5843..5a11a1740b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "sha256-m8Ga0aG+TjWFRo2O2f+NVvdDLGExsPuBGQx6r6mBMXk="; + sha256 = "sha256-XsbD5WYa05tldwBylr6CLwARo61/g4IN686pkCpGGM4="; }; buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/erdtree/default.nix b/third_party/nixpkgs/pkgs/tools/system/erdtree/default.nix new file mode 100644 index 0000000000..a60071e447 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/erdtree/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "erdtree"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "solidiquis"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gZC90flsfH03Grc1netzlv/iX/9DH+rpaSstfXFearc="; + }; + + cargoHash = "sha256-0I60lUYyR4Za2Q3FqcdqJhUKFjX5+PE88G6JxxxiBXw="; + + meta = with lib; { + description = "File-tree visualizer and disk usage analyzer"; + homepage = "https://github.com/solidiquis/erdtree"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index b9391d7000..21691b0d44 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.21.1"; + version = "5.22.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QxepFU/ZQWVH19AeoSnXAAUhLO6VKmrZIIpVw1tTft4="; + hash = "sha256-bWeMZ1tQkJsRJbolZBue9UzM4Qs7K5Rj5Z80Uotyb8I="; }; vendorHash = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48="; diff --git a/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix b/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix index 70a0311c3e..29a80152ed 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "0.10.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-nGdEMLxpw2Ts0dypkoZg3r2NF4IeT1ykbRmrmf9qxrA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GcwPFPE9opGMvdeIUg0Pj6qkk0qPU8MNnFTq9qIxFFs="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix b/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix new file mode 100644 index 0000000000..193fbb0aef --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix @@ -0,0 +1,81 @@ +{ + acpica-tools, + bash, + bc, + coreutils, + fetchFromGitHub, + gawk, + gnugrep, + gnused, + linuxPackages, + lib, + pciutils, + powertop, + resholve, + stdenv, + util-linux, + xorg, + xxd, +}: +resholve.mkDerivation { + pname = "s0ix-selftest-tool"; + version = "unstable-2022-11-04"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "S0ixSelftestTool"; + rev = "1b6db3c3470a3a74b052cb728a544199661d18ec"; + hash = "sha256-w97jfdppW8kC8K8XvBntmkfntIctXDQCWmvug+H1hKA="; + }; + + # don't use the bundled turbostat binary + postPatch = '' + substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat' + substituteInPlace s0ix-selftest-tool.sh --replace 'sudo ' "" + + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool" + runHook postInstall + ''; + + solutions = { + default = { + scripts = ["bin/s0ix-selftest-tool"]; + interpreter = lib.getExe bash; + inputs = [ + acpica-tools + bc + coreutils + gawk + gnugrep + gnused + linuxPackages.turbostat + pciutils + powertop + util-linux + xorg.xset + xxd + ]; + execer = [ + "cannot:${util-linux}/bin/dmesg" + "cannot:${powertop}/bin/powertop" + "cannot:${util-linux}/bin/rtcwake" + "cannot:${linuxPackages.turbostat}/bin/turbostat" + ]; + }; + }; + + meta = with lib; { + homepage = "https://github.com/intel/S0ixSelftestTool"; + description = "A tool for testing the S2idle path CPU Package C-state and S0ix failures"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [adamcstephens]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index aa9ffa6f39..aea767e323 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.15.01"; + version = "0.15.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-reHO426jUI0/jGhVFfurQ5dsRol4e9YlcE7p7nZyBCU="; + hash = "sha256-ryZoW2N93f1jDNF+qZ8y9brPGrTLiOFi2ciIEh1Lt1c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix b/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix index 7b9c8f2e57..43d7480fc7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix +++ b/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix @@ -34,7 +34,7 @@ mkDerivation rec { description = "UEFI firmware image viewer and editor"; homepage = "https://github.com/LongSoft/uefitool"; license = licenses.bsd2; - maintainers = with maintainers; [ ajs124 ]; + maintainers = with maintainers; [ ]; # uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix index 9d189f40fb..a8e8aa1a85 100644 --- a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -1,21 +1,20 @@ { lib +, rustPlatform , fetchFromGitHub , fetchpatch -, rustPlatform -, tree-sitter -, difftastic , testers +, difftastic }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.42.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-9ooVXGZ7MEB4D0awciJJio3ttqxEQ8EUBbIQ6xxrXh0="; + sha256 = "sha256-UI63OJukot+MH+51h/yLnimJAcy8OFan9sUbuZaJZXc="; }; depsExtraArgs = { @@ -40,14 +39,14 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-Zbnk5tcCRoaEH3A1mbsfpEhLe1EMcZqPQ4vzWxi0oG0="; + cargoSha256 = "sha256-IfwZ800PGbmzxQ0e6okieKR7A8jgt+II2j8FRDkiXfw="; passthru.tests.version = testers.testVersion { package = difftastic; }; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; - changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 figsoda ]; mainProgram = "difft"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-emojicodes/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-emojicodes/default.nix new file mode 100644 index 0000000000..01ce8fb3e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-emojicodes/default.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-emojicodes"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "blyxyas"; + repo = "mdbook-emojicodes"; + rev = "${version}.1"; + hash = "sha256-SWT01R/+FuzkkOUd/2wpRo0HIaPEtzDelTSh7ewo9gQ="; + }; + + cargoHash = "sha256-z9UKBBCr8R1I9k48JsEBnVokQDfaj9lt+qfIUvJ/5lE="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; + + meta = with lib; { + description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱"; + homepage = "https://github.com/blyxyas/mdbook-emojicodes"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix new file mode 100644 index 0000000000..c8bc79c2a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-kroki-preprocessor"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "joelcourtney"; + repo = "mdbook-kroki-preprocessor"; + rev = "v${version}"; + hash = "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw="; + }; + + cargoHash = "sha256-IKwDWymAQ1OMQN8Op+DcvqPikoLdOz6lltbhCgOAles="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Render Kroki diagrams from files or code blocks in mdbook"; + homepage = "https://github.com/joelcourtney/mdbook-kroki-preprocessor"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix new file mode 100644 index 0000000000..7ee5f8fdde --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-pagetoc"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "slowsage"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SRrlyUkEdC63NbdAv+J9kb5LTCL/GBwMhnUVdTE4nas="; + }; + + cargoHash = "sha256-Gx6N8VFUnaOvQ290TLeeNj/pVDeK/nUWLjM/KwVAjNo="; + + meta = with lib; { + description = "Table of contents for mdbook (in sidebar)"; + homepage = "https://github.com/slowsage/mdbook-pagetoc"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix index a0eb1f75a3..f03ee98058 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg="; }; + strictDeps = true; + nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix index 755ac6bb32..26037b0566 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml perl ]; installPhase = '' mkdir -p $out/bin cp -p pdfsandwich $out/bin diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix new file mode 100644 index 0000000000..0be4d4a957 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix @@ -0,0 +1,64 @@ +{ fetchurl +, lib +, makeWrapper +, writeShellScriptBin +, ghostscriptX +, ocamlPackages +, texlive +, which +}: + +let + # simplified fake-opam edited from tweag's opam-nix + fake-opam = writeShellScriptBin "opam" '' + case "$1 $2" in + "config var") + case "$3" in + man) echo "$out/share/man";; + etc) echo "$out/etc";; + doc) echo "$out/share/doc";; + share) echo "$out/share";; + prefix) echo "$out";; + *) echo "fake-opam does not understand arguments: $@" ; exit 1 ;; + esac;; + *) echo "fake-opam does not understand arguments: $@" ; exit 1 ;; + esac + ''; + + # texlive currently does not symlink kpsexpand + kpsexpand = writeShellScriptBin "kpsexpand" '' + exec kpsetool -v + ''; +in +ocamlPackages.buildDunePackage rec { + pname = "advi"; + version = "2.0.0"; + + useDune2 = true; + + minimalOCamlVersion = "4.11"; + + src = fetchurl { + url = "http://advi.inria.fr/advi-${version}.tar.gz"; + hash = "sha256-c0DQHlvdekJyXCxmR4+Ut/njtoCzmqX6hNazNv8PpBQ="; + }; + + nativeBuildInputs = [ fake-opam kpsexpand makeWrapper texlive.combined.scheme-medium which ]; + buildInputs = with ocamlPackages; [ camlimages ghostscriptX graphics ]; + + # TODO: ghostscript linked from texlive.combine will override ghostscriptX and break advi + preInstall = '' + make install + wrapProgram "$out/bin/advi" --prefix PATH : "${lib.makeBinPath [ ghostscriptX ]}" + ''; + + # TODO: redirect /share/advi/tex/latex to tex output compatible with texlive.combine + # (requires patching check() in advi-latex-files) + + meta = with lib; { + homepage = "http://advi.inria.fr/"; + description = "Active-DVI is a Unix-platform DVI previewer and a programmable presenter for slides written in LaTeX."; + license = licenses.lgpl21Only; + maintainers = [ maintainers.xworld21 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index 9e989fcc47..28d55f13fe 100644 --- a/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20210715.151551.e7ad03a"; + version = "20221229.172126.d813aa6"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-77yWwfdEul4uLsUNX1dLwj8K0ilcuBaTVKMyXDvKVx4="; + sha256 = "sha256-3otyOpDdiltZ0SR1hImfIDBi53PKuAvh93yq1X3Xkmo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix index 32bc31346a..8cf9dc8498 100644 --- a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ aom bsd3 ]; maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' + # error: use of undeclared identifier 'kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange' + broken = stdenv.isAarch64 && stdenv.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix b/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix index 0967653464..91182c8e17 100644 --- a/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "wtwitch"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "krathalan"; repo = pname; rev = version; - hash = "sha256-KkuXZOquihY3IRVp4FM+AdN3kYi0MqmrXFuNmydTpio="; + hash = "sha256-CHIAxUF0kvt8iV5xRbX5zuOCIecH7NoviQOYiOK0CgY="; }; # hardcode SCRIPT_NAME because #150841 diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix index 7d0da22221..af2258b1a2 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "guest-agent"; - version = "20230112.00"; + version = "20230202.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-uM71qepYnmE4pK+Bdx5l78upNyp2+Myo3ayOAAlRF9s="; + sha256 = "sha256-kPPf6KVQmxF4vUQOIGprevn7RDIjKdbUsYhKGPEearA="; }; vendorHash = "sha256-ioejOtmsi0QnID3V5JxwAz399I5Jp5nHZqpzU9DjpQE="; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix index fe05078ba3..3fb56c6d03 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "google-guest-oslogin"; - version = "20220721.00"; + version = "20230202.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "sha256-VIbejaHN9ANk+9vjpGAYS/SjHx4Tf7SkTqRD1svJRPU="; + sha256 = "sha256-5+8AMm97+GJJYmzKaJ98AtDBwpVXj88d3B8KwZgMpSg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix new file mode 100644 index 0000000000..d8d003b206 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix @@ -0,0 +1,128 @@ +{ cmake +, dnsmasq +, fetchFromGitHub +, git +, gtest +, iproute2 +, iptables +, lib +, libapparmor +, libvirt +, libxml2 +, nixosTests +, openssl +, OVMF +, pkg-config +, qemu +, qemu-utils +, qtbase +, qtx11extras +, slang +, stdenv +, wrapQtAppsHook +, xterm +}: + +let + pname = "multipass"; + version = "1.11.0"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "multipass"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2d8piIIecoSI3BfOgAVlXl5P2UYDaNlxUgHXWbnSdkg="; + fetchSubmodules = true; + }; + + preConfigure = '' + substituteInPlace ./CMakeLists.txt \ + --replace "determine_version(MULTIPASS_VERSION)" "" \ + --replace 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")' + + substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ + --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ + --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" + ''; + + postPatch = '' + # Patch all of the places where Multipass expects the LXD socket to be provided by a snap + substituteInPlace ./src/network/network_access_manager.cpp \ + --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket" + + substituteInPlace ./src/platform/backends/lxd/lxd_virtual_machine.cpp \ + --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket" + + substituteInPlace ./src/platform/backends/lxd/lxd_request.h \ + --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket" + + substituteInPlace ./tests/CMakeLists.txt \ + --replace "FetchContent_MakeAvailable(googletest)" "" + + cat >> tests/CMakeLists.txt <<'EOF' + add_library(gtest INTERFACE) + target_include_directories(gtest INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest INTERFACE ${gtest}/lib/libgtest.so ''${CMAKE_THREAD_LIBS_INIT}) + add_dependencies(gtest GMock) + + add_library(gtest_main INTERFACE) + target_include_directories(gtest_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest_main INTERFACE ${gtest}/lib/libgtest_main.so gtest) + + add_library(gmock INTERFACE) + target_include_directories(gmock INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock INTERFACE ${gtest}/lib/libgmock.so gtest) + + add_library(gmock_main INTERFACE) + target_include_directories(gmock_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock_main INTERFACE ${gtest}/lib/libgmock_main.so gmock gtest_main) + EOF + ''; + + buildInputs = [ + gtest + libapparmor + libvirt + libxml2 + openssl + qtbase + qtx11extras + ]; + + nativeBuildInputs = [ + cmake + git + pkg-config + slang + wrapQtAppsHook + ]; + + nativeCheckInputs = [ gtest ]; + + postInstall = '' + wrapProgram $out/bin/multipassd --prefix PATH : ${lib.makeBinPath [ + dnsmasq + iproute2 + iptables + OVMF.fd + qemu + qemu-utils + xterm + ]} + ''; + + passthru.tests = { + multipass = nixosTests.multipass; + }; + + meta = with lib; { + description = "Ubuntu VMs on demand for any workstation."; + homepage = "https://multipass.run"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jnsgruk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/shotman/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/shotman/default.nix index 91742a7c1c..f285fb1282 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/shotman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-QNRQInFZcB1nqzESTAqYWwqJ0oiJa6UMCpjY3aHBiyA="; + hash = "sha256-BWHQtaDnM6lBEMkD8Y7M2NrWD78rY3yL8dzsa6PBiR0="; }; - cargoHash = "sha256-BfH1HhBbgdCA1IqKNdl4/FEzZxHgJmoSKNVMJUrSHCA="; + cargoHash = "sha256-uckdpzCD3ItUVvpF2fHofcZFkQZzt8Xz/VWFiQ9Hkrs="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix new file mode 100644 index 0000000000..808d5c3c31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayrbar"; + version = "0.3.4"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "swayrbar-${version}"; + sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo="; + }; + + cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8="; + + # don't build swayr + buildAndTestSubdir = pname; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Status command for sway's swaybar implementing the swaybar-protocol"; + homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sebtm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 3931fe9c3d..7943457d38 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -25,12 +25,12 @@ ocamlPackages.buildDunePackage rec { strictDeps = true; nativeBuildInputs = [ - ocamlPackages.ppx_cstruct pkg-config ]; buildInputs = [ libdrm ] ++ (with ocamlPackages; [ dune-configurator + ppx_cstruct wayland cmdliner logs diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 8e828c88c0..818abd1e36 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -124,7 +124,9 @@ mapAliases ({ bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 + bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 + bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 @@ -362,6 +364,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 @@ -511,6 +514,7 @@ mapAliases ({ giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 + git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; @@ -654,6 +658,7 @@ mapAliases ({ idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 + imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 @@ -1051,6 +1056,7 @@ mapAliases ({ nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 + nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 @@ -1465,6 +1471,7 @@ mapAliases ({ subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 + sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14 @@ -1543,6 +1550,7 @@ mapAliases ({ truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 + tvbrowser-bin = throw "tvbrowser-bin was removed because it is now built from sources; use 'tvbrowser' instead"; # Added 2023-02-04 twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11 @@ -1675,6 +1683,7 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 + yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; @@ -1689,6 +1698,7 @@ mapAliases ({ zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28 zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10. + zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 3dcfc0f5d6..34235fd084 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -314,6 +314,8 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity {}; + bibtex-tidy = nodePackages.bibtex-tidy; + binbloom = callPackage ../tools/security/binbloom {}; bingo = callPackage ../development/tools/bingo {}; @@ -390,6 +392,8 @@ with pkgs; chrysalis = callPackage ../applications/misc/chrysalis { }; + circt = callPackage ../development/compilers/circt { }; + classicube = callPackage ../games/classicube { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; @@ -508,6 +512,8 @@ with pkgs; frece = callPackage ../development/tools/frece { }; + frink = callPackage ../development/tools/frink { }; + frugal = callPackage ../development/tools/frugal { }; glade = callPackage ../development/tools/glade { }; @@ -774,6 +780,8 @@ with pkgs; flare-floss = callPackage ../tools/security/flare-floss { }; + flare-signal = callPackage ../applications/networking/instant-messengers/flare-signal { }; + prefer-remote-fetch = import ../build-support/prefer-remote-fetch; global-platform-pro = callPackage ../development/tools/global-platform-pro { }; @@ -1365,12 +1373,22 @@ with pkgs; albert = libsForQt5.callPackage ../applications/misc/albert {}; + alice-tools = callPackage ../tools/games/alice-tools { + withGUI = false; + }; + + alice-tools-qt5 = libsForQt5.callPackage ../tools/games/alice-tools { }; + + alice-tools-qt6 = qt6Packages.callPackage ../tools/games/alice-tools { }; + allure = callPackage ../development/tools/allure {}; aquosctl = callPackage ../tools/misc/aquosctl { }; arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + argocd-vault-plugin = callPackage ../tools/security/argocd-vault-plugin {}; + arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { }; audible-cli = callPackage ../tools/misc/audible-cli { }; @@ -1471,7 +1489,7 @@ with pkgs; headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { }; - httm = callPackage ../tools/filesystems/httm { }; + httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; @@ -1525,6 +1543,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { }; + scarab = callPackage ../tools/games/scarab { }; sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; @@ -1621,8 +1641,6 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - zq = callPackage ../development/tools/zq { }; - ### APPLICATIONS/VERSION-MANAGEMENT deepgit = callPackage ../applications/version-management/deepgit {}; @@ -1881,11 +1899,6 @@ with pkgs; git-subrepo = callPackage ../applications/version-management/git-subrepo { }; - git-subset = callPackage ../applications/version-management/git-subset { - openssl = openssl_1_1; - inherit (darwin.apple_sdk.frameworks) Security; - }; - git-subtrac = callPackage ../applications/version-management/git-subtrac { }; git-sync = callPackage ../applications/version-management/git-sync { }; @@ -2441,6 +2454,7 @@ with pkgs; kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { + go = go_1_20; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) @@ -2485,6 +2499,8 @@ with pkgs; sakura = callPackage ../applications/terminal-emulators/sakura { }; + scriv = callPackage ../applications/version-management/scriv { }; + st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; @@ -3374,6 +3390,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + pbpctrl = callPackage ../applications/audio/pbpctrl { }; + pdepend = callPackage ../development/php-packages/pdepend { }; platformsh = callPackage ../misc/platformsh { }; @@ -4099,6 +4117,8 @@ with pkgs; swayr = callPackage ../tools/wayland/swayr { }; + swayrbar = callPackage ../tools/wayland/swayrbar { }; + swaysome = callPackage ../tools/wayland/swaysome { }; swayimg = callPackage ../tools/wayland/swayimg { }; @@ -4490,7 +4510,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_20; + electron = electron_22; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -4527,6 +4547,8 @@ with pkgs; er-patcher = callPackage ../tools/games/er-patcher { }; + erdtree = callPackage ../tools/system/erdtree { }; + errcheck = callPackage ../development/tools/errcheck { }; eschalot = callPackage ../tools/security/eschalot { }; @@ -4634,6 +4656,8 @@ with pkgs; ### TOOLS/TYPESETTING/TEX + advi = callPackage ../tools/typesetting/tex/advi { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; @@ -5092,8 +5116,9 @@ with pkgs; mapcidr = callPackage ../tools/misc/mapcidr { }; - maple-mono = (callPackage ../data/fonts/maple-font { }).Mono-v5; - maple-mono-NF = (callPackage ../data/fonts/maple-font { }).Mono-NF-v5; + maple-mono = (callPackage ../data/fonts/maple-font { }).Mono; + maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF; + maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF; marl = callPackage ../development/libraries/marl {}; @@ -5355,7 +5380,9 @@ with pkgs; pn = callPackage ../tools/text/pn { }; - pocket-casts = callPackage ../applications/audio/pocket-casts { }; + pocket-casts = callPackage ../applications/audio/pocket-casts { + electron = electron_22; + }; pouf = callPackage ../tools/misc/pouf { }; @@ -5780,7 +5807,7 @@ with pkgs; bup = callPackage ../tools/backup/bup { }; - bupstash = callPackage ../tools/backup/bupstash { }; + bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { }; burp = callPackage ../tools/backup/burp { }; @@ -6806,7 +6833,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_20; + electron = electron_22; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh @@ -6990,6 +7017,8 @@ with pkgs; emborg = python3Packages.callPackage ../development/python-modules/emborg { }; + emblem = callPackage ../applications/graphics/emblem { }; + emem = callPackage ../applications/misc/emem { }; empty = callPackage ../tools/misc/empty { }; @@ -7539,6 +7568,8 @@ with pkgs; gtk = gtk2-x11; }; + gcfflasher = callPackage ../applications/misc/gcfflasher { }; + gdmap = callPackage ../tools/system/gdmap { }; gef = callPackage ../development/tools/misc/gef { }; @@ -7870,6 +7901,8 @@ with pkgs; gyb = callPackage ../tools/backup/gyb { }; + harminv = callPackage ../development/libraries/science/chemistry/harminv { }; + igrep = callPackage ../tools/text/igrep { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8762,6 +8795,8 @@ with pkgs; kibi = callPackage ../applications/editors/kibi { }; + kio-admin = libsForQt5.callPackage ../tools/filesystems/kio-admin { }; + kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -9021,12 +9056,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { }; + mdbook-epub = callPackage ../tools/text/mdbook-epub { inherit (darwin.apple_sdk.frameworks) CoreServices; }; mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; + mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { }; + mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9035,6 +9074,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-kroki-preprocessor = callPackage ../tools/text/mdbook-kroki-preprocessor { }; + mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9074,17 +9115,7 @@ with pkgs; memtester = callPackage ../tools/system/memtester { }; - mesa-demos = - let - wayland' = wayland.override { withLibraries = stdenv.isLinux; }; - in - callPackage ../tools/graphics/mesa-demos { - wayland = wayland'; - wayland-protocols = wayland-protocols.override { - wayland = wayland'; - wayland-scanner = wayland'.bin; - }; - }; + mesa-demos = callPackage ../tools/graphics/mesa-demos { }; mhonarc = perlPackages.MHonArc; @@ -9192,9 +9223,6 @@ with pkgs; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { - openssl = openssl_1_1; - }; nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; @@ -9862,6 +9890,8 @@ with pkgs; mubeng = callPackage ../tools/networking/mubeng { }; + multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; + multitime = callPackage ../tools/misc/multitime { }; sta = callPackage ../tools/misc/sta {}; @@ -10030,7 +10060,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud23 nextcloud24 nextcloud25 nextcloud26; + nextcloud23 nextcloud24 nextcloud25; nextcloud23Packages = ( callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/23.json; @@ -10041,9 +10071,6 @@ with pkgs; nextcloud25Packages = ( callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/25.json; }); - nextcloud26Packages = ( callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/26.json; - }); nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -10288,9 +10315,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - oha = callPackage ../tools/networking/oha { - inherit (darwin.apple_sdk.frameworks) Security; - }; + oha = callPackage ../tools/networking/oha { }; onetun = callPackage ../tools/networking/onetun { inherit (darwin.apple_sdk.frameworks) Security; @@ -10338,6 +10363,8 @@ with pkgs; ombi = callPackage ../servers/ombi { }; + ome_zarr = with python3Packages; toPythonApplication ome-zarr; + omping = callPackage ../applications/networking/omping { }; onefetch = callPackage ../tools/misc/onefetch { @@ -10400,7 +10427,9 @@ with pkgs; inherit (llvmPackages) openmp; }; - openmvs = callPackage ../applications/science/misc/openmvs { }; + openmvs = callPackage ../applications/science/misc/openmvs { + inherit (llvmPackages) openmp; + }; openntpd = callPackage ../tools/networking/openntpd { }; @@ -10781,6 +10810,8 @@ with pkgs; pg_top = callPackage ../tools/misc/pg_top { }; + pgagroal = callPackage ../development/tools/database/pgagroal { }; + pgcenter = callPackage ../tools/misc/pgcenter { }; pgmetrics = callPackage ../tools/misc/pgmetrics { }; @@ -11869,6 +11900,8 @@ with pkgs; silver-searcher = callPackage ../tools/text/silver-searcher { }; + simple-mtpfs = callPackage ../tools/filesystems/simple-mtpfs { }; + simpleproxy = callPackage ../tools/networking/simpleproxy { }; simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; @@ -12253,6 +12286,8 @@ with pkgs; swapview = callPackage ../os-specific/linux/swapview { }; + swc = callPackage ../development/tools/swc { }; + swtpm = callPackage ../tools/security/swtpm { }; svnfs = callPackage ../tools/filesystems/svnfs { }; @@ -12513,6 +12548,8 @@ with pkgs; time-decode = callPackage ../tools/misc/time-decode { }; + timer = callPackage ../tools/misc/timer { }; + tio = callPackage ../tools/misc/tio { }; tiv = callPackage ../applications/misc/tiv { }; @@ -12633,6 +12670,8 @@ with pkgs; tthsum = callPackage ../applications/misc/tthsum { }; + ttdl = callPackage ../applications/misc/ttdl { }; + ttp = with python3.pkgs; toPythonApplication ttp; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; @@ -12721,7 +12760,6 @@ with pkgs; tunnelto = callPackage ../tools/networking/tunnelto { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; tuptime = callPackage ../tools/system/tuptime { }; @@ -13065,6 +13103,7 @@ with pkgs; wasmedge = callPackage ../development/tools/wasmedge { llvmPackages = llvmPackages_12; + inherit (darwin.apple_sdk.frameworks) Foundation; }; welkin = callPackage ../tools/graphics/welkin {}; @@ -13582,10 +13621,6 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; - yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - pkgs = pkgs.__splicedPackages; - nodejs = nodejs.override { openssl = openssl_1_1; }; - }; inherit (yarn2nix-moretea) yarn2nix @@ -13603,6 +13638,8 @@ with pkgs; yamlfix = with python3Packages; toPythonApplication yamlfix; + yamlfmt = callPackage ../development/tools/yamlfmt {}; + yamllint = with python3Packages; toPythonApplication yamllint; yamlpath = callPackage ../development/tools/yamlpath { }; @@ -13788,6 +13825,8 @@ with pkgs; runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; + agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { }; + any-nix-shell = callPackage ../shells/any-nix-shell { }; bash = lowPrio (callPackage ../shells/bash/5.nix { @@ -14761,6 +14800,12 @@ with pkgs; then haskell.compiler.native-bignum.ghc92 else haskell.compiler.ghc92); + alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; + + happy = haskell.lib.compose.justStaticExecutables haskellPackages.happy; + + hscolour = haskell.lib.compose.justStaticExecutables haskellPackages.hscolour; + cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install; stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack; @@ -14829,37 +14874,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { - # Work around while compatibility with ppxlib >= 0.26 is unavailable - # Should be removed when a fix is available - # See https://github.com/FStarLang/FStar/issues/2681 - ocamlPackages = - ocamlPackages.overrideScope' (self: super: { - ppxlib = super.ppxlib.override { - version = if lib.versionAtLeast self.ocaml.version "4.07" - then if lib.versionAtLeast self.ocaml.version "4.08" - then "0.24.0" else "0.15.0" else "0.13.0"; - }; - ppx_deriving_yojson = super.ppx_deriving_yojson.overrideAttrs (oldAttrs: rec { - version = "3.6.1"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = "ppx_deriving_yojson"; - rev = "v${version}"; - sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; - }; - }); - sedlex = super.sedlex.overrideAttrs (oldAttrs: rec { - version = "2.5"; - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = "sedlex"; - rev = "v${version}"; - sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; - }; - }); - }); - }; + fstar = callPackage ../development/compilers/fstar { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -15786,6 +15801,9 @@ with pkgs; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; + + cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15825,8 +15843,8 @@ with pkgs; cargo-wasi = callPackage ../development/tools/rust/cargo-wasi { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices Foundation; + cargo-watch = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-watch { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { @@ -15852,11 +15870,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devserver = callPackage ../development/tools/rust/devserver { - inherit (darwin.apple_sdk.frameworks) CoreServices; - openssl = openssl_1_1; - }; - devspace = callPackage ../development/tools/misc/devspace { }; maturin = callPackage ../development/tools/rust/maturin { @@ -16599,6 +16612,8 @@ with pkgs; poetry = callPackage ../tools/package-management/poetry { }; + poetryPlugins = recurseIntoAttrs poetry.plugins; + poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { inherit pkgs lib; }; @@ -16977,6 +16992,10 @@ with pkgs; kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { }; + lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; + }; + metals = callPackage ../development/tools/language-servers/metals { }; millet = callPackage ../development/tools/language-servers/millet { }; @@ -16985,10 +17004,6 @@ with pkgs; rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; - sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/sumneko-lua-language-server { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; - }; - svls = callPackage ../development/tools/language-servers/svls { }; vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { }; @@ -17093,17 +17108,7 @@ with pkgs; bam = callPackage ../development/tools/build-managers/bam {}; - bazel = bazel_3; - - bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk11_headless; - buildJdkName = "java11"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - bazel_self = bazel_3; - }; + bazel = bazel_6; bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { inherit (darwin) cctools; @@ -17922,7 +17927,7 @@ with pkgs; img = callPackage ../development/tools/img { }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; }; indent = callPackage ../development/tools/misc/indent { }; @@ -18541,6 +18546,8 @@ with pkgs; speedtest-cli = with python3Packages; toPythonApplication speedtest-cli; + spicy-parser-generator = callPackage ../development/tools/parsing/spicy { }; + spin = callPackage ../development/tools/analysis/spin { }; spirv-headers = callPackage ../development/libraries/spirv-headers { }; @@ -18793,6 +18800,8 @@ with pkgs; xcpretty = callPackage ../development/tools/xcpretty { }; + xeus = callPackage ../development/libraries/xeus { }; + xmlindent = callPackage ../development/web/xmlindent {}; xpwn = callPackage ../development/mobile/xpwn {}; @@ -19256,7 +19265,6 @@ with pkgs; coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cointop = callPackage ../applications/misc/cointop { }; @@ -19597,6 +19605,7 @@ with pkgs; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; + fftwQuad = fftw.override { precision = "quad-precision"; }; fftwMpi = fftw.override { enableMpi = true; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -19698,6 +19707,8 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; + functionalplus = callPackage ../development/libraries/functionalplus { }; + galer = callPackage ../tools/security/galer { }; gallia = callPackage ../tools/security/gallia { }; @@ -20434,6 +20445,8 @@ with pkgs; iniparser = callPackage ../development/libraries/iniparser { }; + initool = callPackage ../development/tools/initool { }; + intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { }; intel-media-driver = callPackage ../development/libraries/intel-media-driver { }; @@ -22035,6 +22048,8 @@ with pkgs; opencl-clang = callPackage ../development/libraries/opencl-clang { }; + magic-enum = callPackage ../development/libraries/magic-enum { }; + mapnik = callPackage ../development/libraries/mapnik { harfbuzz = harfbuzz.override { withIcu = true; @@ -23040,6 +23055,10 @@ with pkgs; SDL2_image = callPackage ../development/libraries/SDL2_image { inherit (darwin.apple_sdk.frameworks) Foundation; }; + SDL2_image_2_0_5 = SDL2_image.override({ # Pinned for pygame, toppler + version = "2.0.5"; + hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; + }); SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; @@ -24267,6 +24286,8 @@ with pkgs; clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; + cockpit = callPackage ../servers/monitoring/cockpit { }; + codeowners = callPackage ../development/tools/codeowners { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; @@ -24385,7 +24406,6 @@ with pkgs; freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - openssl = openssl_1_1; }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; @@ -24860,6 +24880,7 @@ with pkgs; mariadb_106 mariadb_108 mariadb_109 + mariadb_1010 ; mariadb = mariadb_106; mariadb-embedded = mariadb.override { withEmbedded = true; }; @@ -24933,6 +24954,8 @@ with pkgs; mir = callPackage ../servers/mir { }; + miriway = callPackage ../applications/window-managers/miriway { }; + icinga2 = callPackage ../servers/monitoring/icinga2 { }; icinga2-agent = callPackage ../servers/monitoring/icinga2 { @@ -25212,6 +25235,8 @@ with pkgs; shairport-sync = callPackage ../servers/shairport-sync { }; + sharing = callPackage ../servers/sharing { }; + showoff = callPackage ../servers/http/showoff {}; serfdom = callPackage ../servers/serf { }; @@ -25568,8 +25593,6 @@ with pkgs; bluez = bluez5; - inherit (python3Packages) bedup; - bolt = callPackage ../os-specific/linux/bolt { }; bpf-linker = callPackage ../development/tools/bpf-linker { }; @@ -25686,9 +25709,7 @@ with pkgs; fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { }; - firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { - openssl = openssl_1_1; - }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; @@ -26047,7 +26068,7 @@ with pkgs; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; - cryptodev = linuxKernel.packages.linux_4_9.cryptodev; + cryptodev = linuxPackages.cryptodev; dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod @@ -26298,6 +26319,8 @@ with pkgs; go-migrate = callPackage ../development/tools/go-migrate { }; + go-jet = callPackage ../development/tools/go-jet { }; + go-mockery = callPackage ../development/tools/go-mockery { }; gomacro = callPackage ../development/tools/gomacro { }; @@ -26908,6 +26931,10 @@ with pkgs; blackbird = callPackage ../data/themes/blackbird { }; + blackout = callPackage ../data/fonts/blackout { }; + + breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; + brise = callPackage ../data/misc/brise { }; cacert = callPackage ../data/misc/cacert { }; @@ -26938,6 +26965,8 @@ with pkgs; chonburi-font = callPackage ../data/fonts/chonburi { }; + chunk = callPackage ../data/fonts/chunk { }; + cldr-annotations = callPackage ../data/misc/cldr-annotations { }; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; @@ -27097,6 +27126,8 @@ with pkgs; fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; + fanwood = callPackage ../data/fonts/fanwood { }; + fira = callPackage ../data/fonts/fira { }; fira-code = callPackage ../data/fonts/fira-code { }; @@ -27149,6 +27180,8 @@ with pkgs; go-font = callPackage ../data/fonts/go-font { }; + goudy-bookletter-1911 = callPackage ../data/fonts/goudy-bookletter-1911 { }; + graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; @@ -27240,6 +27273,8 @@ with pkgs; joypixels = callPackage ../data/fonts/joypixels { }; + junction-font = callPackage ../data/fonts/junction { }; + junicode = callPackage ../data/fonts/junicode { }; julia-mono = callPackage ../data/fonts/julia-mono { }; @@ -27258,6 +27293,8 @@ with pkgs; khmeros = callPackage ../data/fonts/khmeros {}; + knewave = callPackage ../data/fonts/knewave { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -27286,10 +27323,18 @@ with pkgs; lato = callPackage ../data/fonts/lato {}; + league-gothic = callPackage ../data/fonts/league-gothic { }; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + league-script-number-one = callPackage ../data/fonts/league-script-number-one { }; + + league-spartan = callPackage ../data/fonts/league-spartan { }; + ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; + libGDSII = callPackage ../development/libraries/science/chemistry/libGDSII { }; + inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 @@ -27322,6 +27367,8 @@ with pkgs; lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + linden-hill = callPackage ../data/fonts/linden-hill { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {}; @@ -27392,6 +27439,8 @@ with pkgs; material-icons = callPackage ../data/fonts/material-icons { }; + material-symbols = callPackage ../data/fonts/material-symbols { }; + material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -27533,6 +27582,8 @@ with pkgs; orion = callPackage ../data/themes/orion {}; + ostrich-sans = callPackage ../data/fonts/ostrich-sans { }; + overpass = callPackage ../data/fonts/overpass { }; oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; @@ -27601,6 +27652,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + prociono = callPackage ../data/fonts/prociono { }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -27680,10 +27733,14 @@ with pkgs; snap7 = callPackage ../development/libraries/snap7 {}; + sniglet = callPackage ../data/fonts/sniglet { }; + snowblind = callPackage ../data/themes/snowblind { }; solarc-gtk-theme = callPackage ../data/themes/solarc { }; + sorts-mill-goudy = callPackage ../data/fonts/sorts-mill-goudy { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; soundfont-generaluser = callPackage ../data/soundfonts/generaluser { }; @@ -27803,6 +27860,8 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; + the-neue-black = callPackage ../data/fonts/the-neue-black { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { inherit (gnome) adwaita-icon-theme; }; @@ -28062,7 +28121,7 @@ with pkgs; ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { }; + airwave = libsForQt5.callPackage ../applications/audio/airwave { }; akira-unstable = callPackage ../applications/graphics/akira { }; @@ -28220,7 +28279,18 @@ with pkgs; azpainter = callPackage ../applications/graphics/azpainter { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; + bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; blocky = callPackage ../applications/networking/blocky { }; @@ -28759,6 +28829,8 @@ with pkgs; plugins = []; }; + denaro = callPackage ../applications/finance/denaro { }; + dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; dht = callPackage ../applications/networking/p2p/dht { }; @@ -29193,7 +29265,6 @@ with pkgs; finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { @@ -30140,6 +30211,13 @@ with pkgs; shepherd = nodePackages."@nerdwallet/shepherd"; + inherit (callPackage ../applications/virtualization/singularity/packages.nix { }) + apptainer + singularity + apptainer-overriden-nixos + singularity-overriden-nixos + ; + skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -30150,8 +30228,6 @@ with pkgs; slweb = callPackage ../applications/misc/slweb { }; - singularity = callPackage ../applications/virtualization/singularity { }; - sonixd = callPackage ../applications/audio/sonixd { }; sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; @@ -30328,11 +30404,6 @@ with pkgs; avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; - imag = callPackage ../applications/misc/imag { - inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; - }; - image-roll = callPackage ../applications/graphics/image-roll { }; imagej = callPackage ../applications/graphics/imagej { }; @@ -30534,7 +30605,11 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s = callPackage ../applications/networking/cluster/k3s { }; + k3s_1_23 = callPackage ../applications/networking/cluster/k3s/1_23 { }; + k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; + k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; + k3s_1_26 = callPackage ../applications/networking/cluster/k3s/1_26 { }; + k3s = k3s_1_26; k3sup = callPackage ../applications/networking/cluster/k3sup {}; @@ -30542,8 +30617,6 @@ with pkgs; kail = callPackage ../tools/networking/kail { }; - kanboard = callPackage ../applications/misc/kanboard { }; - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -30584,6 +30657,8 @@ with pkgs; khal = callPackage ../applications/misc/khal { }; + khoj = callPackage ../servers/search/khoj { }; + khard = callPackage ../applications/misc/khard { }; kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; @@ -31231,11 +31306,11 @@ with pkgs; xmr-stak = callPackage ../applications/misc/xmr-stak { }; - xmrig = callPackage ../applications/misc/xmrig { }; + xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; - xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; @@ -31621,7 +31696,7 @@ with pkgs; polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { - jre = openjdk11; + jre = openjdk17; }; prevo = callPackage ../applications/misc/prevo { }; @@ -31638,6 +31713,8 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; + rime-cli = callPackage ../applications/office/rime-cli {}; + roxctl = callPackage ../applications/networking/cluster/roxctl { }; @@ -31775,7 +31852,9 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { }; + ncdu = callPackage ../tools/misc/ncdu { + zig = zig_0_10; + }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -31849,7 +31928,9 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; - obsidian = callPackage ../applications/misc/obsidian { }; + obsidian = callPackage ../applications/misc/obsidian { + electron = electron_21; + }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -32222,6 +32303,8 @@ with pkgs; ponymix = callPackage ../applications/audio/ponymix { }; + pop-launcher = callPackage ../applications/misc/pop-launcher { }; + popcorntime = callPackage ../applications/video/popcorntime {}; pothos = libsForQt5.callPackage ../applications/radio/pothos { }; @@ -33819,7 +33902,9 @@ with pkgs; pipewire = null; }; - chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; + chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; weston = callPackage ../applications/window-managers/weston { }; @@ -34539,6 +34624,8 @@ with pkgs; tessera = callPackage ../applications/blockchains/tessera { }; + ton = callPackage ../applications/blockchains/ton { }; + torq = callPackage ../applications/blockchains/torq { }; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { @@ -35675,7 +35762,9 @@ with pkgs; tome4 = callPackage ../games/tome4 { }; - toppler = callPackage ../games/toppler { }; + toppler = callPackage ../games/toppler { + SDL2_image = SDL2_image_2_0_5; + }; torus-trooper = callPackage ../games/torus-trooper { }; @@ -35752,6 +35841,10 @@ with pkgs; libpng = libpng12; }; + vvvvvv = callPackage ../games/vvvvvv { + inherit (darwin.apple_sdk.frameworks) Foundation IOKit; + }; + wargus = callPackage ../games/wargus { }; warmux = callPackage ../games/warmux { }; @@ -35998,6 +36091,10 @@ with pkgs; molden = callPackage ../applications/science/chemistry/molden { }; + mopac = callPackage ../applications/science/chemistry/mopac { }; + + nwchem = callPackage ../applications/science/chemistry/nwchem { }; + octopus = callPackage ../applications/science/chemistry/octopus { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { }; @@ -36022,6 +36119,8 @@ with pkgs; siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; }; + wxmacmolplt = callPackage ../applications/science/chemistry/wxmacmolplt { }; + ### SCIENCE/GEOMETRY antiprism = callPackage ../applications/science/geometry/antiprism { }; @@ -37769,9 +37868,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_12; # fails to build with 2.13 - }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -37946,6 +38043,8 @@ with pkgs; pgadmin4 = callPackage ../tools/admin/pgadmin { }; + pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; }; + pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { }; physlock = callPackage ../misc/screensavers/physlock { }; @@ -38050,6 +38149,14 @@ with pkgs; sailsd = callPackage ../misc/sailsd { }; + sail-riscv-rv32 = callPackage ../applications/virtualization/sail-riscv { + arch = "RV32"; + }; + + sail-riscv-rv64 = callPackage ../applications/virtualization/sail-riscv { + arch = "RV64"; + }; + shc = callPackage ../tools/security/shc { }; shellz = callPackage ../tools/security/shellz { }; @@ -38183,6 +38290,8 @@ with pkgs; prow = callPackage ../applications/networking/cluster/prow { }; + pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { }; + tagref = callPackage ../tools/misc/tagref { }; tcat = callPackage ../tools/misc/tcat { }; @@ -38261,7 +38370,7 @@ with pkgs; trufflehog = callPackage ../tools/security/trufflehog { }; - tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; + tvbrowser = callPackage ../applications/misc/tvbrowser { }; tvheadend = callPackage ../servers/tvheadend { dtv-scan-tables = dtv-scan-tables_tvheadend; @@ -38475,9 +38584,7 @@ with pkgs; xorex = callPackage ../tools/security/xorex { }; - xbps = callPackage ../tools/package-management/xbps { - openssl = openssl_1_1; - }; + xbps = callPackage ../tools/package-management/xbps { }; xcftools = callPackage ../tools/graphics/xcftools { }; @@ -38549,6 +38656,8 @@ with pkgs; yersinia = callPackage ../tools/security/yersinia { }; + yatas = callPackage ../tools/security/yatas { }; + yaxg = callPackage ../tools/graphics/yaxg {}; zap = callPackage ../tools/networking/zap { }; @@ -38697,8 +38806,9 @@ with pkgs; openring = callPackage ../applications/misc/openring { }; - openvino = callPackage ../development/libraries/openvino - { stdenv = gcc10StdenvCompat; python = python3; }; + openvino = callPackage ../development/libraries/openvino { + python = python3; + }; phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index cf00c3da93..b067f5cbbc 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -170,6 +170,10 @@ impure-cmds // appleSourcePackages // chooseLibs // { opencflite = callPackage ../os-specific/darwin/opencflite { }; + openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { + inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers; + }; + stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; trash = callPackage ../os-specific/darwin/trash { }; diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 5d15cff25d..56225b6d42 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -184,9 +184,18 @@ in { then latest else testing; - linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_6_1; - kernelPatches = kernel.kernelPatches; + linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { + # Pinned on the last version which Kent's commits can be cleany rebased up. + kernel = buildLinux rec { + version = "6.1.3"; + modDirVersion = lib.versions.pad 3 version; + extraMeta.branch = lib.versions.majorMinor version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; + }; + }; + kernelPatches = linux_6_1.kernelPatches; }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { diff --git a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix index dbe96bd096..ea975a9b6f 100644 --- a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix @@ -64,7 +64,7 @@ pkgs.releaseTools.sourceTarball { echo "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 301495961e..0e704ce26a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -357,7 +357,12 @@ let then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; - dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; + dune_3 = + if lib.versionAtLeast ocaml.version "4.08" + then callPackage ../development/tools/ocaml/dune/3.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_3 + else throw "dune_3 is not available for OCaml ${ocaml.version}"; dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; @@ -738,6 +743,8 @@ let lastfm = callPackage ../development/ocaml-modules/lastfm { }; + lem = callPackage ../development/ocaml-modules/lem { }; + lens = callPackage ../development/ocaml-modules/lens { }; letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; @@ -752,6 +759,8 @@ let linenoise = callPackage ../development/ocaml-modules/linenoise { }; + linksem = callPackage ../development/ocaml-modules/linksem { }; + llvm = callPackage ../development/ocaml-modules/llvm { libllvm = pkgs.llvmPackages_10.libllvm; }; @@ -1233,6 +1242,10 @@ let rock = callPackage ../development/ocaml-modules/rock { }; + rusage = callPackage ../development/ocaml-modules/rusage { }; + + sail = callPackage ../development/ocaml-modules/sail { }; + samplerate = callPackage ../development/ocaml-modules/samplerate { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 525d737b82..6fa30f0df8 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -915,11 +915,11 @@ let }; AppSqitch = buildPerlModule { - version = "1.1.0"; + version = "1.3.1"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz"; - hash = "sha256-7hRs111jAIN+bKVZuwveJH1CEjyWssXUsoAPONPj0as="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.3.1.tar.gz"; + hash = "sha256-9edo0pjNQEfuKuQjGXgujCzaMSc3vL2/r1gL1H7+i5Q="; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; @@ -5200,14 +5200,14 @@ let CryptOpenSSLRSA = buildPerlPackage { pname = "Crypt-OpenSSL-RSA"; - version = "0.31"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz"; - hash = "sha256-QXNAOtTPdnMhkgmfgz+/vzzYEE4CRrOEQYeuOE0sVDY="; + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.33.tar.gz"; + hash = "sha256-vb5jD21vVAMldGrZmXcnKshmT/gb0Z8K2rptb0Xv2GQ="; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -lcrypto"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; meta = { description = "RSA encoding and decoding, using the openSSL libraries"; @@ -17825,6 +17825,21 @@ let }; }; + NetIPXS = buildPerlPackage { + pname = "Net-IP-XS"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOMHRR/Net-IP-XS-0.22.tar.gz"; + hash = "sha256-JZe0aDizgur3S6XJnD9gpqC1poHsNqFBchJL9E9LGSA="; + }; + propagatedBuildInputs = [ IOCapture TieSimple ]; + meta = { + homepage = "https://github.com/tomhrr/p5-Net-IP-XS"; + description = "IPv4/IPv6 address library"; + license = with lib.licenses; [ gpl2Plus ]; + }; + }; + NetLDAPServer = buildPerlPackage { pname = "Net-LDAP-Server"; version = "0.43"; @@ -19469,10 +19484,10 @@ let PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.0.11-1"; + version = "7.1.0-0"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI="; + hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = @@ -22907,10 +22922,10 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "3.009"; + version = "3.101"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz"; - hash = "sha256-1q0ju/Y3pZtd/RrABkYN/LGFmC5IUs3ncVD70IXx9bY="; + url = "mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz"; + hash = "sha256-0qMt1sIeSzfGqT34CHyp6IDPrmE6Pl766jB7C9yu21g="; }; doCheck = !stdenv.isDarwin; propagatedBuildInputs = [ AppConfig ]; @@ -27791,10 +27806,10 @@ let ZonemasterCLI = buildPerlPackage { pname = "Zonemaster-CLI"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v4.0.1.tar.gz"; - hash = "sha256-7dNPe4E35JLmzoR0xFpVBXLcpQVqve/EXAdt+daWXKA="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v5.0.1.tar.gz"; + hash = "sha256-a/PPgavkaw9gCW44rj7+6AjOOSHKglg4H3kr6jXuRE4="; }; propagatedBuildInputs = [ JSONXS @@ -27818,18 +27833,13 @@ let ZonemasterEngine = buildPerlPackage { pname = "Zonemaster-Engine"; - version = "4.5.1"; + version = "4.6.1"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.5.1.tar.gz"; - hash = "sha256-RdIExtrXzZAXYIS/JCe6qM5QNoSlaZ6+sjbk0zvAuoY="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.6.1.tar.gz"; + hash = "sha256-4AXo3bZTOLnnPjjX5KNb/2O7MRqcAtlqpz5sPwNN9b0="; }; buildInputs = [ PodCoverage TestDifferences TestException TestFatal TestNoWarnings TestPod ]; - propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP Readonly TextCSV ZonemasterLDNS libintl-perl ]; - - preCheck = '' - # disable dnssec test as it fails - rm -f t/Test-dnssec.t t/manifest.t - ''; + propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP NetIPXS Readonly TextCSV ZonemasterLDNS libintl-perl ]; meta = { description = "A tool to check the quality of a DNS zone"; @@ -27839,18 +27849,18 @@ let ZonemasterLDNS = buildPerlPackage { pname = "Zonemaster-LDNS"; - version = "2.2.2"; + version = "3.1.0"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-2.2.2.tar.gz"; - hash = "sha256-4KccPjWqdhkJvjI9QQGCPX/B8vRUGw91eUUgxhHk788="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.1.0.tar.gz"; + hash = "sha256-Rr4uoQg5g9/ZLVnFQiLAz5MB+Uj39U24YWEa+o2+9HE="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include -I${pkgs.libidn2}.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; - makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl_1_1.dev}" ]; + makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl.dev}" ]; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 45baedbbbd..827985cab7 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -84,6 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; { , zendExtension ? false , doCheck ? true , extName ? name + , allowLocalNetworking ? false , ... }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; @@ -103,6 +104,7 @@ lib.makeScope pkgs.newScope (self: with self; { ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; + __darwinAllowLocalNetworking = allowLocalNetworking; preConfigurePhases = [ "cdToExtensionRootPhase" @@ -411,16 +413,8 @@ lib.makeScope pkgs.newScope (self: with self; { valgrind.dev ]; zendExtension = true; - patches = [ ] ++ lib.optionals (lib.versionAtLeast php.version "8.1") [ - (fetchpatch { - # See https://github.com/php/php-src/pull/10266 - name = "avoid-opcache-test-failures.patch"; - url = "https://github.com/PHP/php-src/commit/9216d14b3abfc727b0668592b48699440137aa74.patch"; - sha256 = "sha256-/U6LMn/QGM8BXlh+Etl1z97v3qZFiWL2G3ZopNYShGU="; - }) - ]; # Tests launch the builtin webserver. - __darwinAllowLocalNetworking = true; + allowLocalNetworking = true; } { name = "openssl"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index d9728d8cb5..04da6d141e 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -41,6 +41,7 @@ mapAliases ({ asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 + bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bsblan = python-bsblan; # added 2022-11-04 @@ -82,6 +83,7 @@ mapAliases ({ fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 + flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 3ca8170ac7..cf7d7643e0 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -120,6 +120,8 @@ self: super: with self; { aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; + aio-pika = callPackage ../development/python-modules/aio-pika { }; + aioairzone = callPackage ../development/python-modules/aioairzone { }; aioairq = callPackage ../development/python-modules/aioairq { }; @@ -160,6 +162,8 @@ self: super: with self; { aiodns = callPackage ../development/python-modules/aiodns { }; + aiodocker = callPackage ../development/python-modules/aiodocker { }; + aioeafm = callPackage ../development/python-modules/aioeafm { }; aioeagle = callPackage ../development/python-modules/aioeagle { }; @@ -300,6 +304,8 @@ self: super: with self; { aioridwell = callPackage ../development/python-modules/aioridwell { }; + aiormq = callPackage ../development/python-modules/aiormq { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiortm = callPackage ../development/python-modules/aiortm { }; @@ -532,6 +538,8 @@ self: super: with self; { apprise = callPackage ../development/python-modules/apprise { }; + approval-utilities = callPackage ../development/python-modules/approval-utilities { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; apptools = callPackage ../development/python-modules/apptools { }; @@ -598,6 +606,8 @@ self: super: with self; { arrow = callPackage ../development/python-modules/arrow { }; + arsenic = callPackage ../development/python-modules/arsenic { }; + arviz = callPackage ../development/python-modules/arviz { }; arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; @@ -1067,8 +1077,6 @@ self: super: with self; { azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - azure-storage = callPackage ../development/python-modules/azure-storage { }; - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; @@ -1095,6 +1103,8 @@ self: super: with self; { babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; + bambi = callPackage ../development/python-modules/bambi { }; + pad4pi = callPackage ../development/python-modules/pad4pi { }; pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; @@ -1208,12 +1218,12 @@ self: super: with self; { bech32 = callPackage ../development/python-modules/bech32 { }; - bedup = callPackage ../development/python-modules/bedup { }; - behave = callPackage ../development/python-modules/behave { }; bellows = callPackage ../development/python-modules/bellows { }; + bencode-py = callPackage ../development/python-modules/bencode-py { }; + bencoder = callPackage ../development/python-modules/bencoder { }; beniget = callPackage ../development/python-modules/beniget { }; @@ -1855,6 +1865,8 @@ self: super: with self; { cma = callPackage ../development/python-modules/cma { }; + cmaes = callPackage ../development/python-modules/cmaes { }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; cmd2 = callPackage ../development/python-modules/cmd2 { }; @@ -2231,6 +2243,8 @@ self: super: with self; { datapoint = callPackage ../development/python-modules/datapoint { }; + dataproperty = callPackage ../development/python-modules/dataproperty { }; + dataset = callPackage ../development/python-modules/dataset { }; datasets = callPackage ../development/python-modules/datasets { }; @@ -3394,8 +3408,6 @@ self: super: with self; { flask-babel = callPackage ../development/python-modules/flask-babel { }; - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - flask-babelex = callPackage ../development/python-modules/flask-babelex { }; flask-basicauth = callPackage ../development/python-modules/flask-basicauth { }; @@ -3567,6 +3579,8 @@ self: super: with self; { formbox = callPackage ../development/python-modules/formbox { }; + formulae = callPackage ../development/python-modules/formulae { }; + fortiosapi = callPackage ../development/python-modules/fortiosapi { }; FormEncode = callPackage ../development/python-modules/FormEncode { }; @@ -5255,6 +5269,10 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; + leidenalg = callPackage ../development/python-modules/leidenalg { + igraph-c = pkgs.igraph; + }; + lektor = callPackage ../development/python-modules/lektor { }; leveldb = callPackage ../development/python-modules/leveldb { }; @@ -5756,6 +5774,8 @@ self: super: with self; { mbddns = callPackage ../development/python-modules/mbddns { }; + mbstrdecoder = callPackage ../development/python-modules/mbstrdecoder { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mcstatus = callPackage ../development/python-modules/mcstatus { }; @@ -5790,6 +5810,8 @@ self: super: with self; { mediapy = callPackage ../development/python-modules/mediapy { }; + meep = callPackage ../development/python-modules/meep { }; + meilisearch = callPackage ../development/python-modules/meilisearch { }; meinheld = callPackage ../development/python-modules/meinheld { }; @@ -6581,6 +6603,8 @@ self: super: with self; { omegaconf = callPackage ../development/python-modules/omegaconf { }; + ome-zarr = callPackage ../development/python-modules/ome-zarr { }; + omnikinverter = callPackage ../development/python-modules/omnikinverter { }; omnilogic = callPackage ../development/python-modules/omnilogic { }; @@ -6686,10 +6710,11 @@ self: super: with self; { opentracing = callPackage ../development/python-modules/opentracing { }; - openvino = toPythonModule (pkgs.openvino.override { - inherit (self) python; - enablePython = true; - }); + openvino = callPackage ../development/python-modules/openvino { + openvino-native = pkgs.openvino.override { + inherit python; + }; + }; openwebifpy = callPackage ../development/python-modules/openwebifpy { }; @@ -6971,6 +6996,8 @@ self: super: with self; { peewee = callPackage ../development/python-modules/peewee { }; + peewee-migrate = callPackage ../development/python-modules/peewee-migrate { }; + pefile = callPackage ../development/python-modules/pefile { }; pelican = callPackage ../development/python-modules/pelican { @@ -7229,6 +7256,8 @@ self: super: with self; { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyorthanc = callPackage ../development/python-modules/pyorthanc { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; pyownet = callPackage ../development/python-modules/pyownet { }; @@ -8051,6 +8080,7 @@ self: super: with self; { pygame = callPackage ../development/python-modules/pygame { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + SDL2_image = pkgs.SDL2_image_2_0_5; }; pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; @@ -8616,6 +8646,8 @@ self: super: with self; { pyqvrpro = callPackage ../development/python-modules/pyqvrpro { }; + pyqwikswitch = callPackage ../development/python-modules/pyqwikswitch { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; pyrad = callPackage ../development/python-modules/pyrad { }; @@ -8916,6 +8948,8 @@ self: super: with self; { pytabix = callPackage ../development/python-modules/pytabix { }; + pytablewriter = callPackage ../development/python-modules/pytablewriter { }; + pytado = callPackage ../development/python-modules/pytado { }; pytaglib = callPackage ../development/python-modules/pytaglib { }; @@ -9721,6 +9755,8 @@ self: super: with self; { qnapstats = callPackage ../development/python-modules/qnapstats { }; + qpageview = callPackage ../development/python-modules/qpageview { }; + qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -10028,6 +10064,12 @@ self: super: with self; { ripser = callPackage ../development/python-modules/ripser { }; + riscof = callPackage ../development/python-modules/riscof { }; + + riscv-config = callPackage ../development/python-modules/riscv-config { }; + + riscv-isac = callPackage ../development/python-modules/riscv-isac { }; + rising = callPackage ../development/python-modules/rising { }; ritassist = callPackage ../development/python-modules/ritassist { }; @@ -10054,6 +10096,8 @@ self: super: with self; { rmrl = callPackage ../development/python-modules/rmrl { }; + rmsd = callPackage ../development/python-modules/rmsd { }; + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; rnginline = callPackage ../development/python-modules/rnginline { }; @@ -10388,6 +10432,8 @@ self: super: with self; { inherit (pkgs) sentencepiece; }; + sentence-transformers = callPackage ../development/python-modules/sentence-transformers { }; + sentinel = callPackage ../development/python-modules/sentinel { }; sentinels = callPackage ../development/python-modules/sentinels { }; @@ -10865,6 +10911,8 @@ self: super: with self; { sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; + sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { }; + sphinx = callPackage ../development/python-modules/sphinx { }; sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; @@ -11169,6 +11217,8 @@ self: super: with self; { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; + tabledata = callPackage ../development/python-modules/tabledata { }; + tables = callPackage ../development/python-modules/tables { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -11207,6 +11257,8 @@ self: super: with self; { tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + tcolorpy = callPackage ../development/python-modules/tcolorpy { }; + tcxparser = callPackage ../development/python-modules/tcxparser { }; tcxreader = callPackage ../development/python-modules/tcxreader { }; @@ -11735,6 +11787,8 @@ self: super: with self; { typeguard = callPackage ../development/python-modules/typeguard { }; + typepy = callPackage ../development/python-modules/typepy { }; + typer = callPackage ../development/python-modules/typer { }; types-colorama = callPackage ../development/python-modules/types-colorama { }; @@ -12154,7 +12208,9 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; - watchfiles = callPackage ../development/python-modules/watchfiles { }; + watchfiles = callPackage ../development/python-modules/watchfiles { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; watchgod = callPackage ../development/python-modules/watchgod { }; @@ -12574,7 +12630,7 @@ self: super: with self; { zdaemon = callPackage ../development/python-modules/zdaemon { }; - zeek = (toPythonModule (pkgs.zeek.override { + zeek = (toPythonModule (pkgs.zeek.broker.override { python3 = python; })).py; diff --git a/third_party/nixpkgs/pkgs/top-level/wine-packages.nix b/third_party/nixpkgs/pkgs/top-level/wine-packages.nix index c133e1472e..7cf5533da7 100644 --- a/third_party/nixpkgs/pkgs/top-level/wine-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/wine-packages.nix @@ -30,7 +30,6 @@ rec { full = base.override { gtkSupport = stdenv.isLinux; gstreamerSupport = true; - openalSupport = true; openclSupport = true; odbcSupport = true; netapiSupport = stdenv.isLinux; @@ -39,8 +38,6 @@ rec { v4lSupport = stdenv.isLinux; gphoto2Support = true; krb5Support = true; - ldapSupport = true; - vkd3dSupport = stdenv.isLinux; embedInstallers = true; };